X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3115bfa8a41372ecfd505f22c6a0eb9abc2bc96b:/include/wx/mac/carbon/statline.h diff --git a/include/wx/mac/carbon/statline.h b/include/wx/mac/carbon/statline.h index 911e9f535c..53e95d1084 100644 --- a/include/wx/mac/carbon/statline.h +++ b/include/wx/mac/carbon/statline.h @@ -11,10 +11,6 @@ #ifndef _WX_GENERIC_STATLINE_H_ #define _WX_GENERIC_STATLINE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "statline.h" -#endif - class wxStaticBox; // ---------------------------------------------------------------------------- @@ -23,38 +19,38 @@ class wxStaticBox; class WXDLLEXPORT wxStaticLine : public wxStaticLineBase { - DECLARE_DYNAMIC_CLASS(wxStaticLine) - public: // constructors and pseudo-constructors wxStaticLine() : m_statbox(NULL) { } wxStaticLine( wxWindow *parent, - wxWindowID id, + wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticTextNameStr ) + const wxString &name = wxStaticLineNameStr ) : m_statbox(NULL) { Create(parent, id, pos, size, style, name); } bool Create( wxWindow *parent, - wxWindowID id, + wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticTextNameStr ); + const wxString &name = wxStaticLineNameStr ); // it's necessary to override this wxWindow function because we // will want to return the main widget for m_statbox // WXWidget GetMainWidget() const; - + protected: // we implement the static line using a static box wxStaticBox *m_statbox; + + DECLARE_DYNAMIC_CLASS(wxStaticLine) }; #endif // _WX_GENERIC_STATLINE_H_