A few Unicode fixes.

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 5e9e341fb38355ab817aae34038ccbea2e7dced7..a9910b78a31334822f3eba98a54824c156943d56 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -18,8 +18,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_COMBOBOX
-

 #include "wx/object.h"
 #include "wx/control.h"
 
 #include "wx/object.h"
 #include "wx/control.h"
 


@@ -34,7 +32,7 @@ class wxComboBox;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;

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

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 
 //-----------------------------------------------------------------------------
 // wxComboBox


@@ -77,6 +75,11 @@ public:
   void SetClientObject( int n, wxClientData* clientData );
   wxClientData* GetClientObject( int n );
   
   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 );
   
   void Clear();
   void Delete( int n );
   


@@ -104,6 +107,7 @@ public:
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );

+  void OnChar( wxKeyEvent &event );

   
 // implementation
     
   
 // implementation
     


@@ -119,10 +123,6 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 

-#endif
-
-  // wxUSE_COMBOBOX
-

 #endif
 
   // __GTKCOMBOBOXH__
 #endif
 
   // __GTKCOMBOBOXH__