X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..c04ec4965704643f498999fb5123e63330a3ee50:/include/wx/os2/control.h?ds=inline diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 661efc7b06..396cf35fef 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -26,9 +26,7 @@ public: ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxControlNameStr ) { @@ -48,12 +46,12 @@ 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); + // // Simulates an event // @@ -73,7 +71,7 @@ public: // For ownerdraw items // virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; }; - virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; }; + virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }; wxArrayLong& GetSubcontrols() { return m_aSubControls; } void OnEraseBackground(wxEraseEvent& rEvent); @@ -85,25 +83,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,15 +91,14 @@ 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 @@ -135,10 +113,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;} @@ -151,13 +130,5 @@ private: DECLARE_EVENT_TABLE() }; // end of wxControl -#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 - #endif // _WX_CONTROL_H_