Fix for link error

[wxWidgets.git] / include / wx / gtk1 / combobox.h

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index c27d532b472960d6aa9467e1cd02275c817a12c8..061d74289db1a80dc96eb4601412758e03e30959 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -95,8 +95,6 @@ public:
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );

-    void Select( int n ) { return SetSelection( n ); }
-    bool SetStringSelection( const wxString &string );

     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;
     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;


@@ -111,7 +109,7 @@ public:
     void SetInsertionPoint( long pos );
     void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
     long GetInsertionPoint() const;
     void SetInsertionPoint( long pos );
     void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
     long GetInsertionPoint() const;

-    long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

     void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
     void Replace( long from, long to, const wxString& value );
     void SetSelection( long from, long to );
     void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
     void Replace( long from, long to, const wxString& value );
     void SetSelection( long from, long to );


@@ -122,7 +120,7 @@ public:
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();
     bool CanUndo() const;
     bool CanRedo() const;
     void SelectAll();

-    bool IsEditable() const { return !HasFlag(wxCB_READONLY); }
+    bool IsEditable() const ;

     bool HasSelection() const ;
 
     // implementation
     bool HasSelection() const ;
 
     // implementation