X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..955a919785b76a1826e6b8d55f696a0dfb62a318:/include/wx/gtk/combobox.h?ds=sidebyside

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 8e2b81b6b1..9dfb9e9c2e 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -12,7 +12,7 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "combobox.h"
 #endif
 
@@ -33,7 +33,7 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxComboBoxNameStr;
+extern const wxChar* wxComboBoxNameStr;
 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
@@ -68,20 +68,24 @@ public:
     void Append( const wxString &item );
     void Append( const wxString &item, void* clientData );
     void Append( const wxString &item, wxClientData* clientData );
-  
+
+    void Insert( const wxString &item, int pos );
+    void Insert( const wxString &item, int pos, void* clientData );
+    void Insert( const wxString &item, int pos, wxClientData* clientData );
+
     void SetClientData( int n, void* clientData );
-    void* GetClientData( int n );
+    void* GetClientData( int n ) const;
     void SetClientObject( int n, wxClientData* clientData );
-    wxClientData* GetClientObject( int n );
-  
+    wxClientData* GetClientObject( int n ) const;
+
     void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
     wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
     void SetClientData( void *data )            { wxControl::SetClientData( data ); }
     void *GetClientData() const                 { return wxControl::GetClientData(); }
-    
+
     void Clear();
     void Delete( int n );
-  
+
     int FindString( const wxString &item );
     int GetSelection() const;
     wxString GetString( int n ) const;
@@ -90,6 +94,7 @@ public:
     int Number() const;
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
+    void SetString(int n, const wxString &text);
 
     wxString GetValue() const;
     void SetValue(const wxString& value);
@@ -105,27 +110,31 @@ public:
     void Remove( long from, long to );
     void SetSelection( long from, long to );
     void SetEditable( bool editable );
-  
+
     // implementation
-    
+
+    virtual void SetFocus();
+
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
-  
+
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
+    int      m_prevSelection;
 
     void DisableEvents();
     void EnableEvents();
     void AppendCommon( const wxString &item );
+    void InsertCommon( const wxString &item, int pos );
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
- 
+
 protected:
     virtual wxSize DoGetBestSize() const;
 
-private: 
+private:
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()
 };