1. changed spelling error in wxTR_HAS_VARIABLE_HEIGHT (missing 'E')

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index e2f688290436bb81df8888bc2432152c792f2a94..4fda5e81b8c79176d0422c4be93883a8c137c2dd 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -18,6 +18,8 @@
 
 #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"
 


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

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

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


@@ -75,6 +77,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 );
   


@@ -110,6 +117,8 @@ public:
   wxList   m_clientDataList;
   wxList   m_clientObjectList;
 
   wxList   m_clientDataList;
   wxList   m_clientObjectList;
 

+  void DisableEvents();
+  void EnableEvents();

   void AppendCommon( const wxString &item );
   GtkWidget* GetConnectWidget();
   bool IsOwnGtkWindow( GdkWindow *window );
   void AppendCommon( const wxString &item );
   GtkWidget* GetConnectWidget();
   bool IsOwnGtkWindow( GdkWindow *window );


@@ -118,6 +127,8 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 

+#endif
+

 #endif
 
   // __GTKCOMBOBOXH__
 #endif
 
   // __GTKCOMBOBOXH__