gtk-universal build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-07-07 16:00:41 +00:00
parent 0cd1c6e304
commit b22bb1a015
2 changed files with 2 additions and 2 deletions

View File

@@ -146,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void)
return true; return true;
} }
} else } else
#if defined(__WXMAC__) || defined(__WXGTK20__) #if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
{ {
wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow; wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;

View File

@@ -2912,7 +2912,7 @@ bool wxWindowGTK::GTKHandleFocusIn()
// Notify the parent keeping track of focus for the kbd navigation // Notify the parent keeping track of focus for the kbd navigation
// purposes that we got it. // purposes that we got it.
wxChildFocusEvent eventChildFocus(this); wxChildFocusEvent eventChildFocus(static_cast<wxWindow*>(this));
GTKProcessEvent(eventChildFocus); GTKProcessEvent(eventChildFocus);
wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId()); wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId());