X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c02f0701e960de4a1f60bc821c19c03b8fc88c3..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/motif/control.h?ds=sidebyside diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h index 9fde5ab454..a212c38f56 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,19 +12,15 @@ #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" // General item class -class WXDLLEXPORT wxControl: public wxControlBase +class WXDLLIMPEXP_CORE 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 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 ; - + bool InSetValue() const { return m_inSetValue; } - + protected: // calls wxControlBase::CreateControl, also sets foreground, background and // font to parent's values @@ -72,9 +68,8 @@ protected: // Motif: prevent callbacks being called while in SetValue bool m_inSetValue; - + DECLARE_EVENT_TABLE() }; #endif // _WX_CONTROL_H_ -