fix warnings (double to int conversions and unused variables); removed hard TABs...

[wxWidgets.git] / src / mac / classic / window.cpp

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index e067f9975a5bbf896844af1098e8d1836d3f90c9..1015c2ff601736f22b61eddd1a872f47aa571ca4 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/src/mac/classic/window.cpp
@@ -11,29 +11,33 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/menu.h"

 #include "wx/window.h"
 #include "wx/window.h"

-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/panel.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"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #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/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.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/spinctrl.h"

-#include "wx/log.h"

 #include "wx/geometry.h"
 
 #if wxUSE_CARET
 #include "wx/geometry.h"
 
 #if wxUSE_CARET


@@ -56,7 +60,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;

 wxWindowMac* gFocusWindow = NULL ;
 
 #ifdef __WXUNIVERSAL__
 wxWindowMac* gFocusWindow = NULL ;
 
 #ifdef __WXUNIVERSAL__


@@ -265,13 +268,13 @@ void wxWindowMac::SetFocus()
             wxChildFocusEvent eventFocus(this);
             GetEventHandler()->ProcessEvent(eventFocus);
 
             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 ) ;
             }
             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) ;
             wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;