Include wx/menuitem.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index e0cd3064735890b66a9678e7ecd35eab53c1ce74..97ba0f25e5fa4922811da6d802f7cf121c93a11f 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -20,22 +20,22 @@
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/dc.h"
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/dc.h"

+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/cursor.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/textctrl.h"
+    #include "wx/memory.h"

 #endif
 
 #endif
 

-#include "wx/button.h"

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

-#include "wx/textctrl.h"
-#include "wx/menu.h"

 #include "wx/docview.h"
 #include "wx/filename.h"
 
 #include "wx/docview.h"
 #include "wx/filename.h"
 


@@ -67,8 +67,6 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-extern wxList wxPendingDelete;
-

 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif


@@ -731,11 +729,6 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 

-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-// we know it's there ;-)
-WXIMPORT char std::__throws_bad_alloc ;
-#endif
-

 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,