Unused variable removal.

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 46f90f87320d5e65c62d4f06650e5bdaf33e7c9f..dbf267960f8ad2fbc6b47911c69196e01f2e6e9f 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -11,31 +11,34 @@
 
 #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"
+
+#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"
+#endif
+

 #include "wx/layout.h"
 #include "wx/layout.h"

-#include "wx/dialog.h"

 #include "wx/scrolbar.h"
 #include "wx/statbox.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/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"
 #include "wx/spinctrl.h"

-#include "wx/log.h"

 #include "wx/geometry.h"
 #include "wx/textctrl.h"
 
 #include "wx/toolbar.h"
 #include "wx/geometry.h"
 #include "wx/textctrl.h"
 
 #include "wx/toolbar.h"

-#include "wx/dc.h"

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


@@ -65,8 +68,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;
-

 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else


@@ -514,7 +515,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
 
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
 
         uniChars = new wchar_t[ numChars ] ;
         GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;

-               charBuf[ numChars - 1 ] = 0;
+        charBuf[ numChars - 1 ] = 0;

 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
         memcpy( uniChars , charBuf , numChars * 2 ) ;
 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
         memcpy( uniChars , charBuf , numChars * 2 ) ;