X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9eee2db810695ae4417e9935475f268bb68bbac..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/control.h?ds=sidebyside diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 1627d70c75..0d799ed1cc 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/os2/control.h // Purpose: wxControl class // Author: David Webster // Modified by: // Created: 09/17/99 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,7 +14,7 @@ #include "wx/dynarray.h" // General item class -class WXDLLEXPORT wxControl : public wxControlBase +class WXDLLIMPEXP_CORE wxControl : public wxControlBase { DECLARE_ABSTRACT_CLASS(wxControl) @@ -30,16 +29,8 @@ public: ,const wxString& rsName = wxControlNameStr ) { - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); + Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName ); } - virtual ~wxControl(); bool Create( wxWindow* pParent ,wxWindowID vId @@ -50,6 +41,9 @@ public: ,const wxString& rsName = wxControlNameStr ); + virtual void SetLabel(const wxString& rsLabel); + virtual wxString GetLabel() const { return m_label; } + // // Simulates an event // @@ -68,8 +62,8 @@ public: // // For ownerdraw items // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; }; - virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }; + virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; } + virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; } wxArrayLong& GetSubcontrols() { return m_aSubControls; } void OnEraseBackground(wxEraseEvent& rEvent); @@ -81,25 +75,6 @@ public: ,WXLPARAM lParam ); -#if WXWIN_COMPATIBILITY - virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { } - wxColour* GetButtonColour(void) const { return NULL; } - - inline virtual void SetLabelFont(const wxFont& rFont); - inline virtual void SetButtonFont(const wxFont& rFont); - inline wxFont& GetLabelFont(void) const; - inline wxFont& GetButtonFont(void) const; - - // - // Adds callback - // - inline void Callback(const wxFunction function); - wxFunction GetCallback(void) { return m_callback; } - -protected: - wxFunction m_callback; // Callback associated with the window -#endif // WXWIN_COMPATIBILITY - public: // // For controls like radiobuttons which are really composite @@ -118,7 +93,7 @@ public: ,long lStyle ); // - // Create the control of the given class with the given style, returns FALSE + // Create the control of the given class with the given style, returns false // if creation failed. // bool OS2CreateControl( const wxChar* zClassname @@ -142,18 +117,13 @@ public: inline void SetYComp(const int nYComp) {m_nYComp = nYComp;} private: - int m_nXComp; - int m_nYComp; - DECLARE_EVENT_TABLE() -}; // end of wxControl + int m_nXComp; + int m_nYComp; -#if WXWIN_COMPATIBILITY - inline void wxControl::Callback(const wxFunction f) { m_callback = f; }; - inline wxFont& wxControl::GetLabelFont(void) const { return GetFont(); } - inline wxFont& wxControl::GetButtonFont(void) const { return GetFont(); } - inline void wxControl::SetLabelFont(const wxFont& rFont) { SetFont(rFont); } - inline void wxControl::SetButtonFont(const wxFont& rFont) { SetFont(rFont); } -#endif // WXWIN_COMPATIBILITY + wxString m_label; + WXDWORD m_dwStyle; -#endif // _WX_CONTROL_H_ + DECLARE_EVENT_TABLE() +}; // end of wxControl +#endif // _WX_CONTROL_H_