X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e609c82594a57104ff5e0d4044b2e2697a4b576..a2d6d210991fb1d29570a46e0f26c7a4b9cf89ff:/src/mac/classic/window.cpp?ds=inline diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp index 9e75de3d41..1015c2ff60 100644 --- a/src/mac/classic/window.cpp +++ b/src/mac/classic/window.cpp @@ -18,25 +18,25 @@ #include "wx/app.h" #include "wx/utils.h" #include "wx/panel.h" + #include "wx/frame.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/button.h" + #include "wx/menu.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/scrolbar.h" + #include "wx/statbox.h" + #include "wx/listbox.h" + #include "wx/layout.h" + #include "wx/statusbr.h" + #include "wx/menuitem.h" #endif -#include "wx/menu.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/layout.h" -#include "wx/dialog.h" -#include "wx/listbox.h" -#include "wx/scrolbar.h" -#include "wx/statbox.h" -#include "wx/button.h" -#include "wx/settings.h" -#include "wx/msgdlg.h" -#include "wx/frame.h" #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/tooltip.h" -#include "wx/statusbr.h" -#include "wx/menuitem.h" #include "wx/spinctrl.h" #include "wx/geometry.h" @@ -60,7 +60,6 @@ #include -extern wxList wxPendingDelete; wxWindowMac* gFocusWindow = NULL ; #ifdef __WXUNIVERSAL__ @@ -269,13 +268,13 @@ void wxWindowMac::SetFocus() wxChildFocusEvent eventFocus(this); GetEventHandler()->ProcessEvent(eventFocus); - #ifndef __WXUNIVERSAL__ +#ifndef __WXUNIVERSAL__ wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ; } - #endif +#endif wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ;