applied patch 410892 (wxCopyFile uses ::CopyFile under Win32, has overwrite parameter)

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fe255032bb95d67583b80597e9ce15b65025dbd3..fb294bbc600f83c42e3a18c3253bd36afddfcb57 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -18,6 +18,7 @@
 
 #include "wx/control.h"
 #include "wx/icon.h"
+#include "wx/bitmap.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
@@ -50,8 +51,8 @@ public:
 
     virtual ~wxStaticBitmap() { Free(); }
 
-    void SetIcon(const wxIcon& icon) { SetImage(icon); }
-    void SetBitmap(const wxBitmap& bitmap) { SetImage(bitmap); }
+    void SetIcon(const wxIcon& icon) { SetImage(&icon); }
+    void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
 
     // assert failure is provoked by an attempt to get an icon from bitmap or
     // vice versa
@@ -66,8 +67,8 @@ public:
     // IMPLEMENTATION
 #ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 #endif // __WIN16__
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
     virtual wxSize DoGetBestSize() const;
@@ -78,7 +79,7 @@ protected:
     // TRUE if icon/bitmap is valid
     bool ImageIsOk() const;
 
-    void SetImage(const wxGDIImage& image);
+    void SetImage(const wxGDIImage* image);
 
     // we can have either an icon or a bitmap
     bool m_isIcon;