Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index bdd278fd075522d04fda0f1ea6e869ab4183d90d..b188edce7bed9ebb1ab4534a78065f4a8278a268 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -20,10 +20,10 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
-extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
-class WXDLLEXPORT wxStaticBitmapBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl
 {
 public:
     wxStaticBitmapBase() { }
@@ -40,14 +40,17 @@ public:
         return wxIcon();
     }
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     virtual wxSize DoGetBestSize() const;
 
-    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -56,10 +59,12 @@ protected:
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statbmp.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbmp.h"
+    #include "wx/osx/statbmp.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)