fixed compilation error

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 1d0b3fb8098a05eea86a425d50ab694ca1be1a19..e412b276ad7a64c9a520523e70186a5f449cf40d 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -17,8 +17,9 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/icon.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;

 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl


@@ -83,9 +84,7 @@ protected:
         wxBitmap *bitmap;
     } m_image;
 
         wxBitmap *bitmap;
     } m_image;
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize();

 };
 
 #endif
 };
 
 #endif