X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38374d0d7aa865e9bbe8ee61b75b94ffcdfb220..cba5a276e4821a0ae7d1e7a435d6aab38baa0a9f:/include/wx/control.h?ds=sidebyside diff --git a/include/wx/control.h b/include/wx/control.h index 6f5999c7bc..f13b61e99d 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -16,12 +16,16 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "controlbase.h" #endif +#if wxUSE_CONTROLS + #include "wx/window.h" // base class +WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; + // ---------------------------------------------------------------------------- // wxControl is the base class for all controls // ---------------------------------------------------------------------------- @@ -29,10 +33,23 @@ class WXDLLEXPORT wxControlBase : public wxWindow { public: + virtual ~wxControlBase(); + + // Create() function adds the validator parameter + 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); + // simulates the event of given type (i.e. wxButton::Command() is just as // if the button was clicked) virtual void Command(wxCommandEvent &event); + // get the control alignment (left/right/centre, top/bottom/centre) + int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } + protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children @@ -41,46 +58,35 @@ protected: const wxPoint& pos, const wxSize& size, long style, -#if wxUSE_VALIDATORS const wxValidator& validator, -#endif const wxString& name); - // an overloaded version for the controls without validators - bool CreateControl(wxWindowBase *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - { - return CreateControl(parent, id, pos, size, style, - wxDefaultValidator, name); - } - // inherit colour and font settings from the parent window void InheritAttributes(); + + // initialize the common fields of wxCommandEvent + void InitCommandEvent(wxCommandEvent& event) const; }; // ---------------------------------------------------------------------------- // include platform-dependent wxControl declarations // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/control.h" +#elif defined(__WXMSW__) #include "wx/msw/control.h" #elif defined(__WXMOTIF__) #include "wx/motif/control.h" #elif defined(__WXGTK__) #include "wx/gtk/control.h" -#elif defined(__WXQT__) - #include "wx/qt/control.h" #elif defined(__WXMAC__) #include "wx/mac/control.h" #elif defined(__WXPM__) #include "wx/os2/control.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/control.h" #endif +#endif // wxUSE_CONTROLS + #endif // _WX_CONTROL_H_BASE_