X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511ac294daea69d4bae9644db2fb272c712e059c..307b0b97ee4c88f7fab8b48e463da54b72b41367:/include/wx/os2/control.h diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h index 661efc7b06..fbbb0410c6 100644 --- a/include/wx/os2/control.h +++ b/include/wx/os2/control.h @@ -73,7 +73,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); @@ -112,15 +112,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 +134,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;}