don't use wxStrings in a statically initialized array of structs, VC6 doesn't like...

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 25ac9147169986aab62602ba3b224aefc1a84e91..754945495698005dcb8730922d3558a3e0df30a7 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2138,7 +2138,8 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 // TestMessageBoxDialog
 // ----------------------------------------------------------------------------
 
 // TestMessageBoxDialog
 // ----------------------------------------------------------------------------
 

-TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] =
+/* static */
+const TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] =

 {
     { wxYES,    "&Yes"    },
     { wxNO,     "&No"     },
 {
     { wxYES,    "&Yes"    },
     { wxNO,     "&No"     },

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 0dd71405a5b2c76375706e3551fda0dc8a7a1a25..7be46aaf50ef19d800741ae5a9847c03e7995d74 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -195,10 +195,10 @@ private:
     struct BtnInfo
     {
         int flag;
     struct BtnInfo
     {
         int flag;

-        wxString name;
+        const char *name;

     };
 
     };
 

-    static BtnInfo ms_btnInfo[Btn_Max];
+    static const BtnInfo ms_btnInfo[Btn_Max];

 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;
 
     wxTextCtrl *m_textMsg,
                *m_textExtMsg;