1. wxMSW seems to work (please test and send your bug reports!)

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 99e7ec087870126d3f351c19234a1ce6221a7980..da0b83c2887039eb5d883730bbf5e9f7daf7e764 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -2,13 +2,11 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 


@@ -37,32 +35,65 @@ extern const char *wxChoiceNameStr;
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-class wxChoice: public wxControl
+class wxChoice : public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
-  public:
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 
 

-    wxChoice(void);
+public:
+    wxChoice();

     wxChoice( wxWindow *parent, wxWindowID id,
     wxChoice( wxWindow *parent, wxWindowID id,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, const wxString &name = wxChoiceNameStr );
+            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,
     bool Create( wxWindow *parent, wxWindowID id,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, 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 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 FindString( const wxString &string ) const;

-    int GetColumns(void) const;
-    int GetSelection(void);
+    int GetColumns() const;
+    int GetSelection();

     wxString GetString( int n ) const;
     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 SetColumns( int n = 1 );
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );

+
+    // implementation
+
+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+
+    void AppendCommon( const wxString &item );
+    void ApplyWidgetStyle();

 };
 
 #endif // __GTKCHOICEH__
 };
 
 #endif // __GTKCHOICEH__