X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..e895ec451398f039d577e3e77b0b626531c901d9:/include/wx/gtk/choice.h

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 99e7ec0878..92fb5f40a7 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -2,9 +2,8 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -44,16 +43,26 @@ class wxChoice: public wxControl
   public:
 
     wxChoice(void);
-    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 );
+    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[] = 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 Clear(void);
+    void Delete(int n);
     int FindString( const wxString &string ) const;
     int GetColumns(void) const;
     int GetSelection(void);
@@ -63,6 +72,10 @@ class wxChoice: public wxControl
     void SetColumns( int n = 1 );
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
+    
+  // implementation
+    
+    void ApplyWidgetStyle();
 };
 
 #endif // __GTKCHOICEH__