From d0060e7705e8c8831e1c03ad7ebbfa9d86d001c1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 15 Apr 2002 18:49:57 +0000 Subject: [PATCH 1/1] corrected const char * to char * conversions (patch 543896) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/fontdlgg.h | 6 +++--- src/generic/fontdlgg.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index acf9d1d16a..59c87eacff 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -79,9 +79,9 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog DECLARE_EVENT_TABLE() }; -wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family); -wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight); -wxChar WXDLLEXPORT *wxFontStyleIntToString(int style); +const wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family); +const wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight); +const wxChar WXDLLEXPORT *wxFontStyleIntToString(int style); int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family); int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight); int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style); diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index f7e1eb9375..b7a8f3be4e 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -356,7 +356,7 @@ void wxGenericFontDialog::OnChangeFont(wxCommandEvent& WXUNUSED(event)) m_previewer->Refresh(); } -wxChar *wxFontWeightIntToString(int weight) +const wxChar *wxFontWeightIntToString(int weight) { switch (weight) { @@ -370,7 +370,7 @@ wxChar *wxFontWeightIntToString(int weight) } } -wxChar *wxFontStyleIntToString(int style) +const wxChar *wxFontStyleIntToString(int style) { switch (style) { @@ -384,7 +384,7 @@ wxChar *wxFontStyleIntToString(int style) } } -wxChar *wxFontFamilyIntToString(int family) +const wxChar *wxFontFamilyIntToString(int family) { switch (family) { -- 2.45.2