X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..04ab8b6ddfa26fbabeadad36966a21a42fe649b1:/include/wx/motif/control.h diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 4aae5b7a96..f42138701a 100644 --- a/include/wx/motif/control.h +++ b/include/wx/motif/control.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/motif/control.h // Purpose: wxControl class // Author: Julian Smart // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_CONTROL_H_ #define _WX_CONTROL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "control.h" -#endif - #include "wx/window.h" #include "wx/list.h" #include "wx/validate.h" @@ -24,7 +20,7 @@ class WXDLLEXPORT wxControl: public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) - + public: wxControl(); wxControl( wxWindow *parent, @@ -37,25 +33,25 @@ public: { 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 + + // 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 + + // 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 ; - + bool InSetValue() const { return m_inSetValue; } - + protected: // calls wxControlBase::CreateControl, also sets foreground, background and // font to parent's values @@ -67,11 +63,13 @@ protected: 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() }; #endif // _WX_CONTROL_H_ -