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

Use wxASCII_STR() on string literals

Browse Source 
Fix the build with wxNO_IMPLICIT_WXSTRING_ENCODING.
This commit is contained in:
Arrigo Marchiori
2019-10-22 12:34:29 +02:00
committed by Vadim Zeitlin
parent 65cbf40b7e
commit c86bcf962d
351 changed files with 965 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/artprov/artbrows.cpp
View File

@@ -28,7 +28,7 @@
#include "artbrows.h"
#define ART_CLIENT(id) \
choice->Append(#id, const_cast<void*>(static_cast<const void*>(id)));
choice->Append(#id, new wxStringClientData(id));
#define ART_ICON(id) \
{ \
int ind; \
@@ -38,7 +38,7 @@
else \
ind = 0; \
list->InsertItem(index, #id, ind); \
list->SetItemPtrData(index, wxPtrToUInt(id)); \
list->SetItemPtrData(index, wxPtrToUInt(new wxString(id))); \
index++; \
}
@@ -227,9 +227,9 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
{
const char *data = (const char*)event.GetData();
m_currentArtId = wxString( data );
SetArtBitmap(data, m_client, GetSelectedBitmapSize());
const wxString *data = (const wxString*)event.GetData();
m_currentArtId = *data;
SetArtBitmap(*data, m_client, GetSelectedBitmapSize());
}
void wxArtBrowserDialog::OnChangeSize(wxCommandEvent& WXUNUSED(event))
@@ -239,8 +239,8 @@ void wxArtBrowserDialog::OnChangeSize(wxCommandEvent& WXUNUSED(event))
void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
{
const char *data = (const char*)event.GetClientData();
SetArtClient(data);
wxStringClientData *data = (wxStringClientData *)event.GetClientObject();
SetArtClient(data->GetData());
}
void wxArtBrowserDialog::SetArtBitmap(const wxArtID& id, const wxArtClient& client, const wxSize& size)