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

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

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index ba545c1b93e91cfac6ae4443af44c6160dd3b22a..2867b76ade1ea2ab56fc974c9df54832fbec8853 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -28,10 +28,10 @@ class wxArtProviderModule;
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 

-#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  (id + wxT("_C"))
-#define wxART_MAKE_CLIENT_ID(id)           wxT(#id) wxT("_C")
+#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  ((id) + "_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

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index 697aa5716873675622ce646ba5198bee3becf882..b528dbd45fd4338134e913678fda38808af6e365 100644 (file)
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -189,18 +189,18 @@ void wxArtBrowserDialog::SetArtClient(const wxArtClient& client)
     m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
 
     m_client = client;
     m_list->SetItemState(sel, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
 
     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);
 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
 {
     SetArtBitmap(data, m_client, wxDefaultSize);
 }
 
 void wxArtBrowserDialog::OnChooseClient(wxCommandEvent &event)
 {

-    const wxChar *data = (const wxChar*)event.GetClientData();
+    const char *data = (const char*)event.GetClientData();

     SetArtClient(data);
 }
 
     SetArtClient(data);
 }
 

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 67fee0d39c4d184c2a75522274338ef6f40e5d95..4cbdd3623517913b942af472ba91a59ab154fa5c 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -834,7 +834,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!

-    static const wxChar* const icons[] =
+    static const char* const icons[] =

     {
         wxART_ERROR,
         wxART_WARNING,
     {
         wxART_ERROR,
         wxART_WARNING,