X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..dc484d491b15355285a89da275c58c2ef247d1f4:/include/wx/mac/carbon/statbox.h diff --git a/include/wx/mac/carbon/statbox.h b/include/wx/mac/carbon/statbox.h index 9f73a539ed..11fee4c9b4 100644 --- a/include/wx/mac/carbon/statbox.h +++ b/include/wx/mac/carbon/statbox.h @@ -12,13 +12,9 @@ #ifndef _WX_STATBOX_H_ #define _WX_STATBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "statbox.h" -#endif - #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr; +WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[]; // Group box class WXDLLEXPORT wxStaticBox: public wxControl @@ -26,31 +22,28 @@ class WXDLLEXPORT wxStaticBox: public wxControl DECLARE_DYNAMIC_CLASS(wxStaticBox) public: - inline wxStaticBox() {} - inline wxStaticBox(wxWindow *parent, wxWindowID id, + inline wxStaticBox() {} + inline wxStaticBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxStaticBoxNameStr) - { - Create(parent, id, label, pos, size, style, name); - } + { + Create(parent, id, label, pos, size, style, name); + } - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; - - -protected: + virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; + virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}; -DECLARE_EVENT_TABLE() + virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; }; #endif