automatically initialize m_cRef to 0 (patch 575011 + more)

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index b029e5833a2e494aa0e0c98b1a212c82ca7ac057..9f90791f5b15322028eea947bbd58601ea5f495f 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -30,9 +30,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;


@@ -54,8 +52,6 @@ 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__)
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXPM__)