]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/combobox.h
Compilation fix for old GCC versions.
[wxWidgets.git] / include / wx / os2 / combobox.h
index e1373b9bdc62877475bd5ffea993d73438a43adb..1d008aa644aedaafe7db0456b153e3052584ae7e 100644 (file)
@@ -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