Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index f48a786405c4e3b4c3c28507386270c04f05ae47..84e9e2be49ebc034b47df450bf0195c4518c9c4a 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -12,7 +12,7 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 

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

 #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;
 
 //-----------------------------------------------------------------------------


@@ -69,6 +69,10 @@ public:
     void Append( const wxString &item, void* clientData );
     void Append( const wxString &item, wxClientData* clientData );
   
     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 SetClientObject( int n, wxClientData* clientData );
     void SetClientData( int n, void* clientData );
     void* GetClientData( int n );
     void SetClientObject( int n, wxClientData* clientData );


@@ -86,9 +90,11 @@ public:
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;

+    int GetCount() const { return Number(); }

     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);


@@ -107,16 +113,20 @@ public:
   
     // implementation
     
   
     // implementation
     

+    virtual void SetFocus();
+    

     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
   
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
     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 DisableEvents();
     void EnableEvents();
     void AppendCommon( const wxString &item );

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

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