no message

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 31265e11616e6986b37df2bfef4c8714235b2d99..40cecba7866fcbdfd3685023c82cf09fca4080dc 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -47,7 +46,7 @@ class wxChoice: public wxControl
     inline wxChoice( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr )
@@ -57,12 +56,13 @@ class wxChoice: public wxControl
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
+           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);
@@ -72,6 +72,8 @@ class wxChoice: public wxControl
     void SetColumns( int n = 1 );
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
+    
+    void SetFont( const wxFont &font );
 };
 
 #endif // __GTKCHOICEH__