From 6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b Mon Sep 17 00:00:00 2001
From: "Miguel A. Figueroa-Villanueva" <miguelf@ieee.org>
Date: Sun, 29 Aug 2010 12:22:18 -0400
Subject: [PATCH 1/2] ENH: #9775 Added support for new wxWidgets 2.9 libraries.

Added support for new libraries in wxWidgets 2.9 that are
part of the main distribution. These are: wxPropertyGrid,
wxSTC, wxScintilla, and wxRibbon.
---
 Modules/FindwxWidgets.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 687ae7c21..b7af94acb 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -252,7 +252,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     # FIXME: What if both regex libs are available. regex should be
     # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
     # Find wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
+    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
       FIND_LIBRARY(WX_${LIB}${_DBG}
         NAMES
         wx${LIB}${_UCD}${_DBG} # for regex
@@ -303,7 +303,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     MARK_AS_ADVANCED(WX_mono${_DBG})
 
     # Find wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
+    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+                stc ribbon propgrid)
       FIND_LIBRARY(WX_${LIB}${_DBG}
         NAMES
         wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}

From f51eb9cb0c3bc2a38f0c00780f0d8d050d00891f Mon Sep 17 00:00:00 2001
From: "Miguel A. Figueroa-Villanueva" <miguelf@ieee.org>
Date: Mon, 30 Aug 2010 19:38:45 -0400
Subject: [PATCH 2/2] BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.

Forgot to add new libraries in list of libs to be cleared.
---
 Modules/FindwxWidgets.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index b7af94acb..90818bc64 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -331,7 +331,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
   # Clear all debug or release library paths (arguments are "d" or "").
   MACRO(WX_CLEAR_ALL_LIBS _DBG)
     # Clear wxWidgets common libraries.
-    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
+    FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
       WX_CLEAR_LIB(WX_${LIB}${_DBG})
     ENDFOREACH(LIB)
 
@@ -345,7 +345,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     WX_CLEAR_LIB(WX_mono${_DBG})
 
     # Clear wxWidgets multilib libraries.
-    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
+    FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+                stc ribbon propgrid)
       WX_CLEAR_LIB(WX_${LIB}${_DBG})
     ENDFOREACH(LIB)
   ENDMACRO(WX_CLEAR_ALL_LIBS)