X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44cd54c24e77f6cdf4003156a3d6809e2dd97483..46f5ad7d2caf382080aea46b4a041ebbbf535008:/src/gtk1/window.cpp?ds=inline

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index af70202eaa..753c10c86d 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -219,7 +219,9 @@ extern bool g_mainThreadLocked;
 // debug
 //-----------------------------------------------------------------------------
 
+#ifndef __WXGTK20__
 #define DISABLE_STYLE_IF_BROKEN_THEME 1
+#endif
 
 #ifdef __WXDEBUG__
 
@@ -320,7 +322,8 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 // returns the child of win which currently has focus or NULL if not found
-static wxWindow *FindFocusedChild(wxWindow *win)
+// Note: can't be static, needed by textctrl.cpp.
+/* static */ wxWindow *FindFocusedChild(wxWindow *win)
 {
     wxWindow *winFocus = wxWindow::FindFocus();
     if ( !winFocus )