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
This commit is contained in:
parent
9a5ead1e45
commit
d0060e7705
@ -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);
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user