Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 957f9966b22860c63ca58a119856f3c7911f3931..39f6202e3ca1023ba8c1d6d3a41740e14150a521 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(); }


@@ -52,14 +52,16 @@ public:
     virtual wxBitmap GetBitmap() const;
     virtual wxIcon GetIcon() const;
 
     virtual wxBitmap GetBitmap() const;
     virtual wxIcon GetIcon() 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;
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
     // ctor/dtor helpers
 
     // ctor/dtor helpers

-    void Init() { m_isIcon = true; m_image = NULL; }
+    void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }

     void Free();
 
     // true if icon/bitmap is valid
     void Free();
 
     // true if icon/bitmap is valid


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

+    // 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);
+
+

     // 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;
 

+    // handle used in last call to STM_SETIMAGE
+    WXHANDLE m_currentHandle;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_NO_COPY_CLASS(wxStaticBitmap)