X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..4bc4bae18573d2e8111ed0df0061f32a012f04dd:/include/wx/os2/combobox.h diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index e1373b9bdc..1d008aa644 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -97,8 +97,8 @@ class WXDLLEXPORT wxComboBox : public wxChoice // // List functions: see wxChoice // - inline wxString GetValue(void) const { return GetLabel(); } - virtual void SetValue(const wxString& rsValue); + virtual wxString GetValue(void) const; + virtual void SetValue(const wxString& rsValue); // // Clipboard operations @@ -110,7 +110,7 @@ class WXDLLEXPORT wxComboBox : public wxChoice virtual void SetInsertionPoint(long lPos); virtual void SetInsertionPointEnd(void); virtual long GetInsertionPoint(void) const; - virtual long GetLastPosition(void) const; + virtual wxTextPos GetLastPosition(void) const; virtual void Replace( long lFrom ,long lTo ,const wxString& rsValue @@ -132,13 +132,6 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,WXLPARAM lParam ); -protected: - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); private: DECLARE_DYNAMIC_CLASS(wxComboBox) }; // end of CLASS wxComboBox