X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/os2/control.h diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 396cf35fef..0fc4ceeba5 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.h +// Name: wx/os2/control.h // Purpose: wxControl class // Author: David Webster // Modified by: @@ -15,7 +15,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 +30,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 @@ -51,6 +43,7 @@ public: ); virtual void SetLabel(const wxString& rsLabel); + virtual wxString GetLabel() const { return m_label; } // // Simulates an event @@ -70,7 +63,7 @@ public: // // For ownerdraw items // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; }; + virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }; virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }; wxArrayLong& GetSubcontrols() { return m_aSubControls; } @@ -101,7 +94,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 @@ -125,10 +118,13 @@ public: inline void SetYComp(const int nYComp) {m_nYComp = nYComp;} private: - int m_nXComp; - int m_nYComp; - DECLARE_EVENT_TABLE() + int m_nXComp; + int m_nYComp; + + wxString m_label; + WXDWORD m_dwStyle; + + DECLARE_EVENT_TABLE() }; // end of wxControl #endif // _WX_CONTROL_H_ -