define wxHAS_CONFIG_TEMPLATE_RW if template wxConfig::Read/Write() are available...

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 883b52ae3725f51b07a2a06fae7e34002e4bbd25..7989fce4bc7bdc0b9c3c98261a80c485dedb116c 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -16,10 +16,10 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];

 
 // a control showing an icon or a bitmap
 
 // a control showing an icon or a bitmap

-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase

 {
 public:
     wxStaticBitmap() { Init(); }
 {
 public:
     wxStaticBitmap() { Init(); }


@@ -54,8 +54,10 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 

+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }
+

 protected:
 protected:

-    virtual wxBorder GetDefaultBorder() const;

     virtual wxSize DoGetBestSize() const;
 
     // ctor/dtor helpers
     virtual wxSize DoGetBestSize() const;
 
     // ctor/dtor helpers


@@ -68,6 +70,13 @@ protected:
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 

+#ifndef __WXWINCE__
+    // draw the bitmap ourselves here if the OS can't do it correctly (if it
+    // can we leave it to it)
+    void DoPaintManually(wxPaintEvent& event);
+#endif // !__WXWINCE__
+
+

     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;
     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;