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 e4b7d5e610f4abea3e355e65270c3a391c946fad..4fda5e81b8c79176d0422c4be93883a8c137c2dd 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -17,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_COMBOBOX
+

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


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

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

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


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


@@ -101,12 +109,16 @@ public:
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );
   void SetEditable( bool editable );
   
   void OnSize( wxSizeEvent &event );

+  void OnChar( wxKeyEvent &event );

   
 // implementation
     
   bool     m_alreadySent;
   wxList   m_clientDataList;
   
 // implementation
     
   bool     m_alreadySent;
   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 );


@@ -115,4 +127,8 @@ public:
   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 

-#endif // __GTKCOMBOBOXH__
+#endif
+
+#endif
+
+  // __GTKCOMBOBOXH__