Patch #826420, and also adapted to new SWIG

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index e78a347b7e3716f22a5d2df0b26bc2755bfc7338..02f5c7ef054a92e047132b6f72313e3f1253893a 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbmpbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_STATBMP
 
 #include "wx/control.h"
@@ -29,7 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
- public:
+public:
+    wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
     
     // our interface
@@ -42,6 +45,8 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 
 protected:
     virtual wxSize DoGetBestClientSize() const;
+
+    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
 #if defined(__WXUNIVERSAL__)