made wxUSE_UNICODE=1 the default

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 957f9966b22860c63ca58a119856f3c7911f3931..883b52ae3725f51b07a2a06fae7e34002e4bbd25 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -52,14 +52,14 @@ 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;

 
 protected:
     virtual wxBorder GetDefaultBorder() const;
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxBorder GetDefaultBorder() 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


@@ -72,6 +72,9 @@ protected:
     bool m_isIcon;
     wxGDIImage *m_image;
 
     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)