X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..f54e5c1a4f6952c62ed4480f7d26feddc20f98ba:/include/wx/control.h?ds=sidebyside diff --git a/include/wx/control.h b/include/wx/control.h index b6136bd449..e2db727b4c 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -16,23 +16,26 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "controlbase.h" -#endif - #include "wx/defs.h" #if wxUSE_CONTROLS #include "wx/window.h" // base class -WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[]; + +enum wxEllipsizeMode +{ + wxELLIPSIZE_START, + wxELLIPSIZE_MIDDLE, + wxELLIPSIZE_END +}; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxControlBase : public wxWindow +class WXDLLIMPEXP_CORE wxControlBase : public wxWindow { public: wxControlBase() { } @@ -50,6 +53,50 @@ public: // get the control alignment (left/right/centre, top/bottom/centre) int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } + virtual void SetLabel(const wxString& label) + { + m_labelOrig = label; + + InvalidateBestSize(); + + wxWindow::SetLabel(label); + } + + virtual wxString GetLabel() const + { + // return the original string, as it was passed to SetLabel() + // (i.e. with wx-style mnemonics) + return m_labelOrig; + } + + // get just the text of the label, without mnemonic characters ('&') + wxString GetLabelText() const { return GetLabelText(GetLabel()); } + + void SetLabelText(const wxString& text) + { + SetLabel(EscapeMnemonics(text)); + } + + // static utilities: + + // replaces parts of the string with ellipsis if needed + static wxString Ellipsize(const wxString& label, const wxDC& dc, + wxEllipsizeMode mode, int maxWidth); + + // get the string without mnemonic characters ('&') + static wxString GetLabelText(const wxString& label); + + // removes the mnemonics characters + static wxString RemoveMnemonics(const wxString& str); + + // escapes (by doubling them) the mnemonics + static wxString EscapeMnemonics(const wxString& str); + + // return the accel index in the string or -1 if none and puts the modified + // string into second parameter if non NULL + static int FindAccelIndex(const wxString& label, + wxString *labelOnly = NULL); + // controls by default inherit the colours of their parents, if a // particular control class doesn't want to do it, it can override @@ -63,10 +110,15 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); - virtual void SetLabel( const wxString &label ); virtual bool SetFont(const wxFont& font); + // wxControl-specific processing after processing the update event + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); + protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const; + // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children bool CreateControl(wxWindowBase *parent, @@ -80,16 +132,8 @@ protected: // 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); - } + // this field contains the label in wx format, i.e. with '&' mnemonics + wxString m_labelOrig; DECLARE_NO_COPY_CLASS(wxControlBase) }; @@ -100,14 +144,18 @@ 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__) #include "wx/motif/control.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/control.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/control.h" #elif defined(__WXMAC__) - #include "wx/mac/control.h" + #include "wx/osx/control.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/control.h" #elif defined(__WXPM__)