X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caaa4cfd6779b689d6723e06df23cc23d1799fd3..186005466d585f5553e6acc7d963cd5b62c3ea9f:/include/wx/gtk1/choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 393c9e8861..e405f01c72 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKCHOICEH__
@@ -15,6 +15,7 @@
 #endif
 
 #include "wx/defs.h"
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -29,67 +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)
+    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);
+    }
+    ~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 );
 
-  wxChoice();
-  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 )
-  {
-      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 );
-
-  void Append( const wxString &item );
-  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 Clear();
-  void Delete(int n);
-  
-  int FindString( const wxString &string ) const;
-  int GetColumns() const;
-  int GetSelection();
-  wxString GetString( int n ) const;
-  wxString GetStringSelection() const;
-  int Number() const;
-  void SetColumns( int n = 1 );
-  void SetSelection( int n );
-  void SetStringSelection( const wxString &string );
-    
-// implementation
+    void Append( const wxString &item );
+    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(); }
     
-  wxList   m_clientDataList;
-  wxList   m_clientObjectList;
+    void Clear();
+    void Delete(int n);
 
-  void AppendCommon( const wxString &item );
-  void ApplyWidgetStyle();
+    int FindString( const wxString &string ) const;
+    int GetColumns() const;
+    int GetSelection();
+    wxString GetString( int n ) const;
+    wxString GetStringSelection() const;
+    int Number() const;
+    void SetColumns( int n = 1 );
+    void SetSelection( int n );
+    void SetStringSelection( const wxString &string );
+
+    // implementation
+
+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+
+    void DisableEvents();
+    void EnableEvents();
+    void AppendCommon( const wxString &item );
+    void ApplyWidgetStyle();
 };
 
+
 #endif // __GTKCHOICEH__