X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/control.h diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 4913175b71..a212c38f56 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -1,50 +1,75 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/motif/control.h // Purpose: wxControl class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CONTROL_H_ #define _WX_CONTROL_H_ -#ifdef __GNUG__ -#pragma interface "control.h" -#endif - #include "wx/window.h" #include "wx/list.h" #include "wx/validate.h" // General item class -class WXDLLEXPORT wxControl: public wxWindow +class WXDLLIMPEXP_CORE wxControl: public wxControlBase { - DECLARE_ABSTRACT_CLASS(wxControl) + DECLARE_ABSTRACT_CLASS(wxControl) + public: - wxControl(); - ~wxControl(); + wxControl(); + 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); - virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; // Simulates an event - virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and - // appropriate event handlers - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const ; + // simulates the event, returns true if the event was processed + virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - // Places item in centre of panel - so can't be used BEFORE panel->Fit() - void Centre(int direction = wxHORIZONTAL); - inline void Callback(const wxFunction function) { m_callback = function; }; // Adds callback + // calls the callback and appropriate event handlers, returns true if + // event was processed + virtual bool ProcessCommand(wxCommandEvent& event); - inline wxFunction GetCallback() { return m_callback; } + virtual void SetLabel(const wxString& label); + virtual wxString GetLabel() const ; + + bool InSetValue() const { return m_inSetValue; } protected: - wxFunction m_callback; // Callback associated with the window + // calls wxControlBase::CreateControl, also sets foreground, background and + // font to parent's values + bool CreateControl(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name); + + // native implementation using XtQueryGeometry + virtual wxSize DoGetBestSize() const; + + // Motif: prevent callbacks being called while in SetValue + bool m_inSetValue; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; -#endif - // _WX_CONTROL_H_ +#endif // _WX_CONTROL_H_