Added (Start|End)DrawingOnTop stubs

[wxWidgets.git] / include / wx / statbmp.h

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 93f26e79245c927ddccabe604330a0d19dbf2971..7481a381af7110a01f9537ca1dfa94a92bb2e57c 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,10 +12,12 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "statbmpbase.h"
 #endif
 
     #pragma interface "statbmpbase.h"
 #endif
 

+#include "wx/defs.h"
+

 #if wxUSE_STATBMP
 
 #include "wx/control.h"
 #if wxUSE_STATBMP
 
 #include "wx/control.h"


@@ -30,9 +32,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
  public:
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
  public:

-#ifdef __DARWIN__
-    ~wxStaticBitmapBase() { }
-#endif
+    virtual ~wxStaticBitmapBase();

     
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;


@@ -56,10 +56,10 @@ protected:
     #include "wx/gtk/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
     #include "wx/gtk/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statbmp.h"

 #elif defined(__WXPM__)
     #include "wx/os2/statbmp.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statbmp.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/statbmp.h"

 #endif
 
 #endif // wxUSE_STATBMP
 #endif
 
 #endif // wxUSE_STATBMP