Wrappers for *ToText

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index f741d8b4d0bd82327ebb4360e44f608b12bdc912..49bcf7fb93103b96dc910b6ec6abbeed8e7431fe 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(NO_GCC_PRAGMA)

     #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"


@@ -29,10 +31,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {

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

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


@@ -43,7 +44,9 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:

-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -54,14 +57,12 @@ 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(__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