Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-11 11:22:58 +00:00
parent d30ef76952
commit b3ca7c855f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/dialogs/dialogs.cpp
View File

@@ -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" }, { wxYES, "&Yes" },
{ wxNO, "&No" }, { wxNO, "&No" },

4
samples/dialogs/dialogs.h
View File

@@ -195,10 +195,10 @@ private:
struct BtnInfo struct BtnInfo
{ {
int flag; int flag;
wxString name; const char *name;
}; };
static BtnInfo ms_btnInfo[Btn_Max]; static const BtnInfo ms_btnInfo[Btn_Max];
wxTextCtrl *m_textMsg, wxTextCtrl *m_textMsg,
*m_textExtMsg; *m_textExtMsg;