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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 9308aca1c32910175a460786b7cb76633eb173d9..5f42224be9049a01b1cf751b2703a9aae227648f 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/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:

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 670d12cbf3ebf4adcad3a6d1a5dddee098dc51d3..45d6e4e326625da438f118bd26e7168f4c87c645 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/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)

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index e673612db0138599047f86f054b20ba902821b98..f741d8b4d0bd82327ebb4360e44f608b12bdc912 100644 (file)
--- a/include/wx/statbmp.h
+++ b/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;

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index fd0f461f173833798c03ad22da21b7a9e10b681b..409d2fb3a82799c6abd6f96ac07250f56c689dc7 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/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/setup.h"
-#include "wx/utils.h"
-#include "wx/palette.h"
+#include "wx/defs.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)

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index fd0f461f173833798c03ad22da21b7a9e10b681b..409d2fb3a82799c6abd6f96ac07250f56c689dc7 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/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/setup.h"
-#include "wx/utils.h"
-#include "wx/palette.h"
+#include "wx/defs.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)

diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp
index 2a9d09a8bf48ace5c357801b05b55b777c71c02c..ecf13c8f70dc2dd673028406a29d8be8297dbcf0 100644 (file)
--- a/src/mac/carbon/checklst.cpp
+++ b/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
 // ============================================================================

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index cafbf2ed98076120aeeca5fcd3caeb21a688c63b..f2651ba5945afca59b967d3a0a7e8fbdb4c7f438 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/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"

diff --git a/src/mac/carbon/statbmp.cpp b/src/mac/carbon/statbmp.cpp
index 1605258450a15a073be758da83ac1fe609e95bed..35e918d469812fd4e6d9c2b952c7e7e19fd2234d 100644 (file)
--- a/src/mac/carbon/statbmp.cpp
+++ b/src/mac/carbon/statbmp.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/defs.h"

diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp
index 2a9d09a8bf48ace5c357801b05b55b777c71c02c..ecf13c8f70dc2dd673028406a29d8be8297dbcf0 100644 (file)
--- a/src/mac/checklst.cpp
+++ b/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
 // ============================================================================

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index cafbf2ed98076120aeeca5fcd3caeb21a688c63b..f2651ba5945afca59b967d3a0a7e8fbdb4c7f438 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/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"

diff --git a/src/mac/statbmp.cpp b/src/mac/statbmp.cpp
index 1605258450a15a073be758da83ac1fe609e95bed..35e918d469812fd4e6d9c2b952c7e7e19fd2234d 100644 (file)
--- a/src/mac/statbmp.cpp
+++ b/src/mac/statbmp.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "statbmp.h"
+  #pragma implementation "statbmp.h"
 #endif
 
 #include "wx/defs.h"