Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 24281700b402d7996afc8377ca80428b7fdbff6f..ec229a832943ce5f54debd81d0a06bce55b49f23 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 char) 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() { }
@@ -45,9 +45,12 @@ public:
     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__)
@@ -61,7 +64,7 @@ protected:
 #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__)