Makefile tweaks

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 92fb5f40a706764dfd0f0e82826b70a09b4c6f70..393c9e886182b57ffd515194f7bfe6805b882340 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
@@ -40,42 +39,57 @@ class wxChoice: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxChoice)
 
-  public:
+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 )
-    {
+  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);
-    }
-    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 Clear(void);
-    void Delete(int n);
-    int FindString( const wxString &string ) const;
-    int GetColumns(void) const;
-    int GetSelection(void);
-    wxString GetString( int n ) const;
-    wxString GetStringSelection(void) const;
-    int Number(void) const;
-    void SetColumns( int n = 1 );
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
+  }
+  ~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
+// implementation
     
-    void ApplyWidgetStyle();
+  wxList   m_clientDataList;
+  wxList   m_clientObjectList;
+
+  void AppendCommon( const wxString &item );
+  void ApplyWidgetStyle();
 };
 
 #endif // __GTKCHOICEH__