start of alpha transparency support

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index f741d8b4d0bd82327ebb4360e44f608b12bdc912..3b5cc2890639b059de2ea6651c7d2b9818821ddb 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,7 +12,7 @@
 #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
 


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

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

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


@@ -54,14 +52,10 @@ protected:
     #include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statbmp.h"
     #include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statbmp.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/statbmp.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/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