Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index c78e8308fe684cac2f8c621b0e0ec8143ca07136..139b8811e20ce2acaa09c41fe1fbe7b84948e86e 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -29,7 +29,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr )
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr )
     {

-        m_strings = (wxSortedArrayString *)NULL;
+        m_strings = NULL;

 
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }


@@ -41,7 +41,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr )
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr )
     {

-        m_strings = (wxSortedArrayString *)NULL;
+        m_strings = NULL;

 
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }


@@ -49,7 +49,7 @@ public:
     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[] = (wxString *) NULL,
+            int n = 0, const wxString choices[] = NULL,

             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );