Name clash correction

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp
index ab69a605f9b756682adc4731501cd54a8cdca113..b59a7a07a1a89eae936b4177027b792ceb2cb29e 100644 (file)
--- a/src/mac/carbon/fontdlg.cpp
+++ b/src/mac/carbon/fontdlg.cpp
@@ -45,8 +45,8 @@
 // wxFontDialog stub for mac OS's without a native font dialog
 // ---------------------------------------------------------------------------
 
 // 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)
     {
     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);
 
     }
     m_facenameCtrl->SetStringSelection(facename);
 


@@ -521,7 +521,7 @@ void wxFontDialog::ChangeFont()
     int size = m_sizeCtrl->GetValue();
     wxString facename = m_facenameCtrl->GetStringSelection();
 
     int size = m_sizeCtrl->GetValue();
     wxString facename = m_facenameCtrl->GetStringSelection();
 

-    int family = wxFontFamilyStringToInt(facename);
+    int family = FontFamilyStringToInt(facename);

     if (family == -1)
         family = wxDEFAULT;
     else
     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)
     {
 {
     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;
 {
     if (!family)
         return wxSWISS;