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

Make art provider id of type "char *" instead of "wxChar *".

Browse Source 
These strings don't need to be wide and, as elsewhere, prefer the
compatibility with 2.8 ANSI build to compatibility with Unicode build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-12-31 17:38:51 +00:00
parent 46eada874a
commit 19be42b760
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/artprov.h
View File

@@ -28,10 +28,10 @@ class wxArtProviderModule;
typedef wxString wxArtClient; typedef wxString wxArtClient;
typedef wxString wxArtID; typedef wxString wxArtID;
#define wxART_MAKE_CLIENT_ID_FROM_STR(id) (id + wxT("_C")) #define wxART_MAKE_CLIENT_ID_FROM_STR(id) ((id) + "_C")
#define wxART_MAKE_CLIENT_ID(id) wxT(#id) wxT("_C") #define wxART_MAKE_CLIENT_ID(id) (#id "_C")
#define wxART_MAKE_ART_ID_FROM_STR(id) (id) #define wxART_MAKE_ART_ID_FROM_STR(id) (id)
#define wxART_MAKE_ART_ID(id) wxT(#id) #define wxART_MAKE_ART_ID(id) (#id)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Art clients // Art clients

6
samples/artprov/artbrows.cpp
View File

@@ -189,18 +189,18 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
m_client = client; m_client = client;
SetArtBitmap((const wxChar*)m_list->GetItemData(sel), m_client); SetArtBitmap((const char*)m_list->GetItemData(sel), m_client);
} }
void wxArtBrowserDialog::OnSelectItem(wxListEvent &event) void wxArtBrowserDialog::OnSelectItem(wxListEvent &event)
{ {
const wxChar *data = (const wxChar*)event.GetData(); const char *data = (const char*)event.GetData();
SetArtBitmap(data, m_client, wxDefaultSize); SetArtBitmap(data, m_client, wxDefaultSize);
} }
void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event) void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
{ {
const wxChar *data = (const wxChar*)event.GetClientData(); const char *data = (const char*)event.GetClientData();
SetArtClient(data); SetArtClient(data);
} }

2
src/generic/logg.cpp
View File

@@ -834,7 +834,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE); wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
// order should be the same as in the switch below! // order should be the same as in the switch below!
static const wxChar* const icons[] = static const char* const icons[] =
{ {
wxART_ERROR, wxART_ERROR,
wxART_WARNING, wxART_WARNING,