X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..f8c4475a3e579655f6a962822824596a7a9cfb66:/include/wx/gtk1/choice.h?ds=sidebyside

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 40cecba786..e405f01c72 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -2,12 +2,11 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
@@ -16,6 +15,7 @@
 #endif
 
 #include "wx/defs.h"
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -30,50 +30,74 @@ class wxChoice;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxChoiceNameStr;
+extern const wxChar *wxChoiceNameStr;
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice: public wxControl
+class wxChoice : public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
-  public:
-
-    wxChoice(void);
-    inline wxChoice( wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = (const wxString *) NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr )
+    DECLARE_DYNAMIC_CLASS(wxChoice)
+
+public:
+    wxChoice();
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (const wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr )
     {
-      Create(parent, id, pos, size, n, choices, style, validator, name);
+        Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+    ~wxChoice();
     bool Create( wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = (wxString *) NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxChoiceNameStr );
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+
     void Append( const wxString &item );
-    void Clear(void);
+    void Append( const wxString &item, void* clientData );
+    void Append( const wxString &item, wxClientData* clientData );
+
+    void SetClientData( int n, void* clientData );
+    void* GetClientData( 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);
+
     int FindString( const wxString &string ) const;
-    int GetColumns(void) const;
-    int GetSelection(void);
+    int GetColumns() const;
+    int GetSelection();
     wxString GetString( int n ) const;
-    wxString GetStringSelection(void) const;
-    int Number(void) const;
+    wxString GetStringSelection() const;
+    int Number() const;
     void SetColumns( int n = 1 );
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
-    
-    void SetFont( const wxFont &font );
+
+    // implementation
+
+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+
+    void DisableEvents();
+    void EnableEvents();
+    void AppendCommon( const wxString &item );
+    void ApplyWidgetStyle();
 };
 
+
 #endif // __GTKCHOICEH__