1. wxApp::ProcessPendingEvents() is now common, added appcmn.cpp and

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 0a7eeca3d8d2874ec02dd4486624973395f30306..7b95f490da0844fc5d391c22f1245596ad624f3b 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -15,6 +15,7 @@
 #endif
 
 #include "wx/defs.h"
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -29,7 +30,7 @@ class wxChoice;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxChoiceNameStr;
+extern const wxChar *wxChoiceNameStr;
 
 //-----------------------------------------------------------------------------
 // wxChoice
@@ -37,8 +38,6 @@ extern const char *wxChoiceNameStr;
 
 class wxChoice : public wxControl
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
     wxChoice();
     wxChoice( wxWindow *parent, wxWindowID id,
@@ -69,6 +68,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);
 
@@ -87,8 +91,14 @@ public:
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
 
+    void DisableEvents();
+    void EnableEvents();
     void AppendCommon( const wxString &item );
     void ApplyWidgetStyle();
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
+
 #endif // __GTKCHOICEH__