compilation fixes for gcc 2.7.2.1 under FreeBSD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 41417e2af40a69d810b8b9446e18944b2a3ee4d7..b1856957a534433b95d2b4caf5705fd17cff998b 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -41,7 +41,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,

-            const wxString choices[] = (wxString[]) NULL,
+            const wxString choices[] = (const wxString *) NULL,

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 41417e2af40a69d810b8b9446e18944b2a3ee4d7..b1856957a534433b95d2b4caf5705fd17cff998b 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -41,7 +41,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,

-            const wxString choices[] = (wxString[]) NULL,
+            const wxString choices[] = (const wxString *) NULL,

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 3eaf62c54bcf9ac740a009e5abd6bdd20c292efb..e47e7bd8054147c25ddf5c11b5589e5a1a528157 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -31,8 +31,8 @@ wxCheckListBox::wxCheckListBox() :
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,

-                 int nStrings,
-                 const wxString choices[],
+                 int nStrings, 
+                 const wxString *choices,

                  long style,
                  const wxValidator& validator,
                  const wxString& name )
                  long style,
                  const wxValidator& validator,
                  const wxString& name )

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 3eaf62c54bcf9ac740a009e5abd6bdd20c292efb..e47e7bd8054147c25ddf5c11b5589e5a1a528157 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -31,8 +31,8 @@ wxCheckListBox::wxCheckListBox() :
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,

-                 int nStrings,
-                 const wxString choices[],
+                 int nStrings, 
+                 const wxString *choices,

                  long style,
                  const wxValidator& validator,
                  const wxString& name )
                  long style,
                  const wxValidator& validator,
                  const wxString& name )