cleaning up problems after string changes

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index a1fadbbf60904589a84145b6f47288a8e99ce984..883b52ae3725f51b07a2a06fae7e34002e4bbd25 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -52,11 +52,11 @@ 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
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
 
     // ctor/dtor helpers
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }


@@ -71,8 +71,9 @@ protected:
     // 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
     // handle used in last call to STM_SETIMAGE

-    HGDIOBJ m_currentHandle;
+    WXHANDLE m_currentHandle;

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