From: Paul Cornett <paulcor@bullseye.com>
Date: Mon, 7 Jul 2008 16:00:41 +0000 (+0000)
Subject: gtk-universal build fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b22bb1a015c4cc734e55bdfcebabc99da24e185e

gtk-universal build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 37cefb5e74..1266e49a90 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -146,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
-#if defined(__WXMAC__) || defined(__WXGTK20__)
+#if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 89c6390b6a..72073cf314 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2912,7 +2912,7 @@ bool wxWindowGTK::GTKHandleFocusIn()
 
     // Notify the parent keeping track of focus for the kbd navigation
     // purposes that we got it.
-    wxChildFocusEvent eventChildFocus(this);
+    wxChildFocusEvent eventChildFocus(static_cast<wxWindow*>(this));
     GTKProcessEvent(eventChildFocus);
 
     wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId());