X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9abe166a3073d9e9ceb0110429a45adc6517d76f..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 5ae7c44043..17db76e571 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -10,7 +10,7 @@ #ifndef __GTKCONTROLH__ #define __GTKCONTROLH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -33,12 +33,20 @@ class wxControl : public wxControlBase { public: wxControl(); - wxControl( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxPanelNameStr ); + wxControl(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr) + { + Create(parent, id, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr); // this function will filter out '&' characters and will put the accelerator // char (the one immediately after '&') into m_chAccel (TODO not yet) @@ -46,9 +54,14 @@ public: virtual wxString GetLabel() const; protected: + virtual wxSize DoGetBestSize() const; +#ifdef __WXGTK20__ + wxString PrepareLabelMnemonics( const wxString &label ) const; +#endif + wxString m_label; char m_chAccel; // enabled to avoid breaking binary compatibility later on - + private: DECLARE_DYNAMIC_CLASS(wxControl) };