Apply [ 1713345 ] combobox: cmd accelerators shouldn't steal editing hotkeys

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 82b1a921a17a35d68f91618adb1c02cb7a1b4573..883b52ae3725f51b07a2a06fae7e34002e4bbd25 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -16,7 +16,7 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
@@ -49,21 +49,17 @@ public:
 
     virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
     virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
+    virtual wxBitmap GetBitmap() const;
+    virtual wxIcon GetIcon() const;
 
-    // can always be used, whether we have a bitmap or an icon in reality
-    wxBitmap GetBitmap() const;
-
-    // can only be used if an icon had been originally used
-    wxIcon GetIcon() const;
-
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) 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; }
+    void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
     void Free();
 
     // true if icon/bitmap is valid
@@ -76,6 +72,9 @@ protected:
     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)