synchronize GTK2 minimum version in docs

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 39f6202e3ca1023ba8c1d6d3a41740e14150a521..9466edf5122f352c3b587efa5bb9d4a2e735f638 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -58,7 +58,7 @@ public:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() 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; }


@@ -70,9 +70,11 @@ protected:
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 

+#ifndef __WXWINCE__

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

+#endif // !__WXWINCE__

 
 
     // we can have either an icon or a bitmap
 
 
     // we can have either an icon or a bitmap


@@ -84,7 +86,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

-    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);

 };
 
 #endif
 };
 
 #endif