Fix for internal compiler error

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index e7be38f91bae964dbc823fdbc3644d7d801ca12f..65938c863628ca4f94319bf3ed06d5f75b36bafc 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -12,7 +12,7 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 


@@ -33,7 +33,7 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxComboBoxNameStr;
+extern const wxChar* wxComboBoxNameStr;

 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------


@@ -65,23 +65,27 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-    void Append( const wxString &item );
-    void Append( const wxString &item, void* clientData );
-    void Append( const wxString &item, wxClientData* clientData );
-  
+    int Append( const wxString &item );
+    int Append( const wxString &item, void* clientData );
+    int Append( const wxString &item, wxClientData* clientData );
+
+    int Insert( const wxString &item, int pos );
+    int Insert( const wxString &item, int pos, void* clientData );
+    int Insert( const wxString &item, int pos, wxClientData* clientData );
+

     void SetClientData( int n, void* clientData );
     void SetClientData( int n, void* clientData );

-    void* GetClientData( int n );
+    void* GetClientData( int n ) const;

     void SetClientObject( int n, wxClientData* clientData );
     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 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 );
     void Clear();
     void Delete( int n );

-  
+

     int FindString( const wxString &item );
     int GetSelection() const;
     wxString GetString( int n ) const;
     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 );
     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);
 
     wxString GetValue() const;
     void SetValue(const wxString& value);


@@ -105,12 +110,14 @@ public:
     void Remove( long from, long to );
     void SetSelection( long from, long to );
     void SetEditable( bool editable );
     void Remove( long from, long to );
     void SetSelection( long from, long to );
     void SetEditable( bool editable );

-  
+

     // implementation
     // implementation

-    
+
+    virtual void SetFocus();
+

     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );

-  
+

     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;


@@ -118,15 +125,16 @@ public:
 
     void DisableEvents();
     void EnableEvents();
 
     void DisableEvents();
     void EnableEvents();

-    void AppendCommon( const wxString &item );
+    int AppendCommon( const wxString &item );
+    int InsertCommon( const wxString &item, int pos );

     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     GtkWidget* GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();

- 
+

 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

-private: 
+private:

     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()
 };