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

Name clash correction

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-03-08 23:35:16 +00:00
parent cd2e8564d7
commit f75ae77cd7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/carbon/fontdlg.cpp
View File

@@ -45,8 +45,8 @@
// wxFontDialog stub for mac OS's without a native font dialog
// ---------------------------------------------------------------------------
static const wxChar *wxFontFamilyIntToString(int family);
static int wxFontFamilyStringToInt(const wxChar *family);
static const wxChar *FontFamilyIntToString(int family);
static int FontFamilyStringToInt(const wxChar *family);
//-----------------------------------------------------------------------------
@@ -496,7 +496,7 @@ void wxFontDialog::InitializeControls()
wxString facename = m_dialogFont.GetFaceName();
if (facename.empty() || m_facenameCtrl->FindString(facename) == wxNOT_FOUND)
{
facename = wxFontFamilyIntToString(m_dialogFont.GetFamily());
facename = FontFamilyIntToString(m_dialogFont.GetFamily());
}
m_facenameCtrl->SetStringSelection(facename);
@@ -521,7 +521,7 @@ void wxFontDialog::ChangeFont()
int size = m_sizeCtrl->GetValue();
wxString facename = m_facenameCtrl->GetStringSelection();
int family = wxFontFamilyStringToInt(facename);
int family = FontFamilyStringToInt(facename);
if (family == -1)
family = wxDEFAULT;
else
@@ -555,7 +555,7 @@ void wxFontDialog::OnPanelClose()
{
}
const wxChar *wxFontFamilyIntToString(int family)
const wxChar *FontFamilyIntToString(int family)
{
switch (family)
{
@@ -575,7 +575,7 @@ const wxChar *wxFontFamilyIntToString(int family)
}
}
int wxFontFamilyStringToInt(const wxChar *family)
int FontFamilyStringToInt(const wxChar *family)
{
if (!family)
return wxSWISS;