X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f4b46717b61482cd9ebca5c8d3056840e0b7a72..682214d5c6ec3e56dbdfd0c97d70d87e614b38c2:/include/wx/control.h diff --git a/include/wx/control.h b/include/wx/control.h index bcfe71a48f..98905ebe3e 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -5,7 +5,7 @@ // Modified by: // Created: 26.07.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ #include "wx/window.h" // base class -WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxControlNameStr; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls @@ -63,6 +63,9 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); + virtual void SetLabel( const wxString &label ); + virtual bool SetFont(const wxFont& font); + protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children @@ -74,12 +77,20 @@ protected: const wxValidator& validator, const wxString& name); - // inherit colour and font settings from the parent window - void InheritAttributes(); - // initialize the common fields of wxCommandEvent void InitCommandEvent(wxCommandEvent& event) const; + // set the initial window size if none is given (i.e. at least one of the + // components of the size passed to ctor/Create() is -1) + // + // normally just calls SetBestSize() but can be overridden not to do it for + // the controls which have to do some additional initialization (e.g. add + // strings to list box) before their best size can be accurately calculated + virtual void SetInitialBestSize(const wxSize& size) + { + SetBestSize(size); + } + DECLARE_NO_COPY_CLASS(wxControlBase) }; @@ -89,6 +100,8 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/univ/control.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/control.h" #elif defined(__WXMSW__) #include "wx/msw/control.h" #elif defined(__WXMOTIF__)