X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0148fe1e2a2ea076bcd7a647c0b7946de0e0f990..e81a301cbdc8729b0a71fa5dfd7124bf59368673:/include/wx/motif/control.h diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 9662c06ad1..b029556632 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -23,58 +23,57 @@ #define wxControlNameStr _T("control") // General item class -class WXDLLEXPORT wxControl: public wxWindow +class WXDLLEXPORT wxControl: public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) - + public: wxControl(); wxControl( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxControlNameStr ); - -#if wxUSE_VALIDATORS - wxControl( wxWindow *parent, - wxWindowID id, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxControlNameStr ); -#endif - ~wxControl(); - + 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); + // simulates the event, returns TRUE if the event was processed virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - + // calls the callback and appropriate event handlers, returns TRUE if // event was processed virtual bool ProcessCommand(wxCommandEvent& event); - + virtual void SetLabel(const wxString& label); virtual wxString GetLabel() const ; - + #if WXWIN_COMPATIBILITY void Callback(const wxFunction function) { m_callback = function; }; // Adds callback - + wxFunction GetCallback() { return m_callback; } #endif // WXWIN_COMPATIBILITY - + bool InSetValue() const { return m_inSetValue; } - + protected: #if WXWIN_COMPATIBILITY wxFunction m_callback; // Callback associated with the window #endif // WXWIN_COMPATIBILITY - + bool m_inSetValue; // Motif: prevent callbacks being called while - // in SetValue - + // in SetValue + DECLARE_EVENT_TABLE() }; #endif - // _WX_CONTROL_H_ +// _WX_CONTROL_H_