X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c15fd9fba8844fe0e7d21ffca744c053e84f7c52..5001df0dd594c4128de79e3dc31d40b4587ba331:/contrib/include/wx/gizmos/statpict.h diff --git a/contrib/include/wx/gizmos/statpict.h b/contrib/include/wx/gizmos/statpict.h index a9ce912a26..fd8633dbe6 100644 --- a/contrib/include/wx/gizmos/statpict.h +++ b/contrib/include/wx/gizmos/statpict.h @@ -12,16 +12,14 @@ #ifndef _WX_STATPICT_H_ #define _WX_STATPICT_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "statpict.h" -#endif - #include "wx/control.h" #include "wx/icon.h" #include "wx/bitmap.h" #include "wx/image.h" +#include "wx/gizmos/gizmos.h" + enum { wxSCALE_HORIZONTAL = 0x1, @@ -30,10 +28,9 @@ enum wxSCALE_CUSTOM = 0x8 }; -//WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; -extern const wxChar* wxStaticPictureNameStr; +WXDLLIMPEXP_GIZMOS extern const wxChar* wxStaticPictureNameStr; -class /*WXDLLEXPORT*/ wxStaticPicture : public wxControl +class WXDLLIMPEXP_GIZMOS wxStaticPicture : public wxControl { DECLARE_DYNAMIC_CLASS(wxStaticPicture) @@ -57,8 +54,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 );