X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/control.h diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 661efc7b06..41ba89cc41 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: @@ -26,20 +26,11 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxControlNameStr ) { - Create( pParent - ,vId - ,rPos - ,rSize - ,lStyle - ,rValidator - ,rsName - ); + Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName ); } virtual ~wxControl(); @@ -48,12 +39,13 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxControlNameStr ); + virtual void SetLabel(const wxString& rsLabel); + virtual wxString GetLabel() const { return m_label; } + // // Simulates an event // @@ -72,8 +64,8 @@ public: // // For ownerdraw items // - virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; }; - virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* 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; } void OnEraseBackground(wxEraseEvent& rEvent); @@ -85,25 +77,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 @@ -112,18 +85,17 @@ public: virtual wxSize DoGetBestSize(void) const; - bool OS2CreateControl( wxWindow* pParent - ,wxWindowID lId - ,const wxPoint& rPos - ,const wxSize& rSize - ,long lStyle -#if wxUSE_VALIDATORS - ,const wxValidator& rValidator -#endif - ,const wxString& rsName + // + // Create the control of the given PM class + // + bool OS2CreateControl( const wxChar* zClassname + ,const wxString& rsLabel + ,const wxPoint& rPos + ,const wxSize& rSize + ,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 @@ -135,10 +107,11 @@ public: ); // - // Determine the extended styles combination for this window (may slightly - // modify styl parameter) + // Default style for the control include WS_TABSTOP if it AcceptsFocus() // - WXDWORD GetExStyle(WXDWORD& rStyle) const; + virtual WXDWORD OS2GetStyle( long lStyle + ,WXDWORD* pdwExstyle + ) const; inline int GetXComp(void) const {return m_nXComp;} inline int GetYComp(void) const {return m_nYComp;} @@ -146,18 +119,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_