corrections for Mac OS X after wxUniv merge

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/bitmap.h

@@ -13,11 +13,9 @@
 #define _WX_BITMAP_H_
 
 #ifdef __GNUG__
-#pragma interface "bitmap.h"
+  #pragma interface "bitmap.h"
 #endif
 
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
 #include "wx/palette.h"
 
 // Bitmap
@@ -209,7 +207,6 @@ public:
   static void InitStandardHandlers();
   static void CleanUpHandlers();
 protected:
-  static wxList sm_handlers;
 
   // TODO: Implementation
 public:

include/wx/mac/stattext.h

@@ -16,10 +16,6 @@
 #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
 class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)

include/wx/statbmp.h

@@ -29,7 +29,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
-public:
+ public:
+#ifdef __WXMAC_X__
+    ~wxStaticBitmapBase() { }
+#endif
+    
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;

src/mac/bitmap.cpp

@@ -10,13 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+#pragma implementation "bitmapbase.h"
 #pragma implementation "bitmap.h"
 #endif
 
-#include "wx/wx.h"
+#include "wx/defs.h"
-#include "wx/setup.h"
+
-#include "wx/utils.h"
-#include "wx/palette.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"
@@ -241,7 +240,7 @@ wxBitmapRefData::~wxBitmapRefData()
   }
 }
 
-wxList wxBitmap::sm_handlers;
+wxList wxBitmapBase::sm_handlers;
 
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)

src/mac/carbon/bitmap.cpp

@@ -10,13 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
+#pragma implementation "bitmapbase.h"
 #pragma implementation "bitmap.h"
 #endif
 
-#include "wx/wx.h"
+#include "wx/defs.h"
-#include "wx/setup.h"
+
-#include "wx/utils.h"
-#include "wx/palette.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"
@@ -241,7 +240,7 @@ wxBitmapRefData::~wxBitmapRefData()
   }
 }
 
-wxList wxBitmap::sm_handlers;
+wxList wxBitmapBase::sm_handlers;
 
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)

src/mac/carbon/checklst.cpp

@@ -17,10 +17,12 @@
 #pragma implementation "checklst.h"
 #endif
 
-#include "wx/checklst.h"
+#include "wx/defs.h"
 
 #if wxUSE_CHECKLISTBOX
 
+#include "wx/checklst.h"
+
 // ============================================================================
 // implementation
 // ============================================================================

src/mac/carbon/radiobox.cpp

@@ -14,7 +14,8 @@
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma implementation "radiobox.h"
+  #pragma implementation "radioboxbase.h"
+  #pragma implementation "radiobox.h"
 #endif
 
 #include "wx/defs.h"

src/mac/carbon/statbmp.cpp

@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/defs.h"

src/mac/checklst.cpp

@@ -17,10 +17,12 @@
 #pragma implementation "checklst.h"
 #endif
 
-#include "wx/checklst.h"
+#include "wx/defs.h"
 
 #if wxUSE_CHECKLISTBOX
 
+#include "wx/checklst.h"
+
 // ============================================================================
 // implementation
 // ============================================================================

src/mac/radiobox.cpp

@@ -14,7 +14,8 @@
 //-------------------------------------------------------------------------------------
 
 #ifdef __GNUG__
-#pragma implementation "radiobox.h"
+  #pragma implementation "radioboxbase.h"
+  #pragma implementation "radiobox.h"
 #endif
 
 #include "wx/defs.h"

src/mac/statbmp.cpp

@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/defs.h"