X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06cfab17389f4bbd38560dd86ee39931e979bb1e..8506d95db494b020068bf2a7a69763b0f2b661b5:/include/wx/gtk/combobox.h

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 5e9e341fb3..d1787f8ca0 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -34,7 +34,7 @@ class wxComboBox;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;
-extern const char* wxEmptyString;
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -77,6 +77,11 @@ public:
   void SetClientObject( int n, wxClientData* clientData );
   wxClientData* GetClientObject( int n );
   
+  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 );
   
@@ -104,6 +109,7 @@ public:
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );
+  void OnChar( wxKeyEvent &event );
   
 // implementation
     
@@ -121,8 +127,6 @@ public:
 
 #endif
 
-  // wxUSE_COMBOBOX
-
 #endif
 
   // __GTKCOMBOBOXH__