X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fca36d9a0301c9bff307361f1f94048897ce2ae5..33e87fe84cb3e0f6b1db4829e0a6b971030d4990:/contrib/include/wx/gizmos/statpict.h diff --git a/contrib/include/wx/gizmos/statpict.h b/contrib/include/wx/gizmos/statpict.h index 942d6d2b6b..6408a6d2a3 100644 --- a/contrib/include/wx/gizmos/statpict.h +++ b/contrib/include/wx/gizmos/statpict.h @@ -22,6 +22,8 @@ #include "wx/bitmap.h" #include "wx/image.h" +#include "wx/gizmos/gizmos.h" + enum { wxSCALE_HORIZONTAL = 0x1, @@ -33,7 +35,7 @@ enum //WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; extern const wxChar* wxStaticPictureNameStr; -class /*WXDLLEXPORT*/ wxStaticPicture : public wxControl +class WXDLLIMPEXP_GIZMOS wxStaticPicture : public wxControl { DECLARE_DYNAMIC_CLASS(wxStaticPicture) @@ -57,8 +59,8 @@ public: long style = 0, const wxString& name = wxStaticPictureNameStr ); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; + virtual void Command(wxCommandEvent& WXUNUSED(event)) {} + virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event)) {return true;} void OnPaint(wxPaintEvent& event); void SetBitmap( const wxBitmap& bmp ); @@ -109,7 +111,7 @@ public: ScaleY = sy; } - int GetCustomScale( float* sx, float* sy ) const + void GetCustomScale( float* sx, float* sy ) const { *sx = ScaleX; *sy = ScaleY;