Reworked the undef stuff a little

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index e4b7d5e610f4abea3e355e65270c3a391c946fad..a9910b78a31334822f3eba98a54824c156943d56 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/defs.h"
+
 #include "wx/object.h"
 #include "wx/control.h"
 
@@ -31,7 +32,7 @@ class wxComboBox;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;
-extern const char* wxEmptyString;
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -74,6 +75,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 );
   
@@ -101,11 +107,13 @@ public:
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );
+  void OnChar( wxKeyEvent &event );
   
 // implementation
     
   bool     m_alreadySent;
   wxList   m_clientDataList;
+  wxList   m_clientObjectList;
 
   void AppendCommon( const wxString &item );
   GtkWidget* GetConnectWidget();
@@ -115,4 +123,6 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
-#endif // __GTKCOMBOBOXH__
+#endif
+
+  // __GTKCOMBOBOXH__