X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/934dac2fd54db20cbb9459fa9b22cd756441dfd8..1338c59a025505bc066be220fe56e898a72b3ad3:/include/wx/os2/listbox.h?ds=inline diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h index ffe2719d88..813885934a 100644 --- a/include/wx/os2/listbox.h +++ b/include/wx/os2/listbox.h @@ -44,9 +44,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr) { Create( pParent @@ -56,9 +54,7 @@ public: ,n ,asChoices ,lStyle -#if wxUSE_VALIDATORS ,rValidator -#endif ,rsName ); } @@ -70,9 +66,7 @@ public: ,int n = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr ); @@ -121,7 +115,7 @@ public: // wxCheckListBox support // #if wxUSE_OWNER_DRAWN - bool OS2OnMeasure(WXMEASUREITEMSTRUCT *item); + long OS2OnMeasure(WXMEASUREITEMSTRUCT *item); bool OS2OnDraw(WXDRAWITEMSTRUCT *item); virtual wxOwnerDrawn* CreateItem(size_t n); @@ -151,21 +145,6 @@ protected: #endif private: -#if wxUSE_WX_RESOURCES -# if wxUSE_OWNER_DRAWN - virtual wxControl* CreateItem( const wxItemResource* pChildResource - ,const wxItemResource* pParentResource - ,const wxResourceTable* pTable = (const wxResourceTable *) NULL - ) - { - return(wxWindowBase::CreateItem( pChildResource - ,pParentResource - ,pTable - ) - ); - } -# endif -#endif DECLARE_DYNAMIC_CLASS(wxListBox) }; // end of wxListBox