From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Sep 2008 11:22:58 +0000 (+0000)
Subject: don't use wxStrings in a statically initialized array of structs, VC6 doesn't like... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b3ca7c855f89570a077738900ecef24b55929bbd

don't use wxStrings in a statically initialized array of structs, VC6 doesn't like it (re-closes #9492)

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 25ac914716..7549454956 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -2138,7 +2138,8 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 // TestMessageBoxDialog
 // ----------------------------------------------------------------------------
 
-TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] =
+/* static */
+const TestMessageBoxDialog::BtnInfo TestMessageBoxDialog::ms_btnInfo[] =
 {
     { wxYES,    "&Yes"    },
     { wxNO,     "&No"     },
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 0dd71405a5..7be46aaf50 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -195,10 +195,10 @@ private:
     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;