FreeBSD patch to sckaddr.cpp; include more files in manual; misc

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index b3feb2c065035aa9e42cc03a0508b13cb52a3fd8..9929a37fef33e3d50ee5f20ea8d3421e24d47ae3 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -44,25 +44,37 @@ class wxChoice: public wxControl
   public:
 
     wxChoice(void);
-    wxChoice( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const long style = 0, const wxString &name = wxChoiceNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const 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[] = (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( const int n ) const;
+    wxString GetString( int n ) const;
     wxString GetStringSelection(void) const;
     int Number(void) const;
-    void SetColumns( const int n = 1 );
-    void SetSelection( const int n );
+    void SetColumns( int n = 1 );
+    void SetSelection( int n );
     void SetStringSelection( const wxString &string );
+    
+    void SetFont( const wxFont &font );
 };
 
 #endif // __GTKCHOICEH__