allow raw access to a part of the image only (faster when using alpha)

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 8e2b81b6b1ddfa763a4bddaa916b9adf6f0dbde8..63304d121f313a9bb958c9289ac7a68e81a4c286 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/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;
 
 //-----------------------------------------------------------------------------
@@ -90,6 +90,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);
@@ -108,12 +109,15 @@ public:
   
     // 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();