Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 5e9e341fb38355ab817aae34038ccbea2e7dced7..4fda5e81b8c79176d0422c4be93883a8c137c2dd 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -34,7 +34,7 @@ class wxComboBox;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;

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

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


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


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

+  void OnChar( wxKeyEvent &event );

   
 // implementation
     
   
 // implementation
     


@@ -111,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 );


@@ -121,8 +129,6 @@ public:
 
 #endif
 
 
 #endif
 

-  // wxUSE_COMBOBOX
-

 #endif
 
   // __GTKCOMBOBOXH__
 #endif
 
   // __GTKCOMBOBOXH__