"const" added to wxAccelTable ctor

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 31265e11616e6986b37df2bfef4c8714235b2d99..6849cec905da2b8cd57c863ca3a5659999249b96 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -47,7 +47,7 @@ class wxChoice: public wxControl
     inline wxChoice( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
     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 )
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr )


@@ -57,12 +57,13 @@ class wxChoice: public wxControl
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
     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);
            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);
     int FindString( const wxString &string ) const;
     int GetColumns(void) const;
     int GetSelection(void);


@@ -72,6 +73,7 @@ class wxChoice: public wxControl
     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 );

+    void SetFont( const wxFont &font );

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