1. wxChoice and wxComboBox support client data under MSW

[wxWidgets.git] / src / msw / font.cpp

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index d6c84ee3b6d5a2812f88d9a46ac07c1c425e3c89..b615928b1ae6897f3ce2c1e3eda30e4b04d0e1ba 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -122,28 +122,28 @@ bool wxFont::RealizeResource(void)
     BYTE ff_italic;
     int ff_weight = 0;
     int ff_family = 0;
     BYTE ff_italic;
     int ff_weight = 0;
     int ff_family = 0;

-    wxString ff_face("");
+    wxString ff_face(_T(""));

 
     switch (M_FONTDATA->m_family)
     {
       case wxSCRIPT:     ff_family = FF_SCRIPT ;
 
     switch (M_FONTDATA->m_family)
     {
       case wxSCRIPT:     ff_family = FF_SCRIPT ;

-                         ff_face = "Script" ;
+                         ff_face = _T("Script") ;

                          break ;
       case wxDECORATIVE: ff_family = FF_DECORATIVE;
                          break;
       case wxROMAN:      ff_family = FF_ROMAN;
                          break ;
       case wxDECORATIVE: ff_family = FF_DECORATIVE;
                          break;
       case wxROMAN:      ff_family = FF_ROMAN;

-                         ff_face = "Times New Roman" ;
+                         ff_face = _T("Times New Roman") ;

                          break;
       case wxTELETYPE:
       case wxMODERN:     ff_family = FF_MODERN;
                          break;
       case wxTELETYPE:
       case wxMODERN:     ff_family = FF_MODERN;

-                         ff_face = "Courier New" ;
+                         ff_face = _T("Courier New") ;

                          break;
       case wxSWISS:      ff_family = FF_SWISS;
                          break;
       case wxSWISS:      ff_family = FF_SWISS;

-                         ff_face = "Arial";
+                         ff_face = _T("Arial") ;

                          break;
       case wxDEFAULT:
       default:           ff_family = FF_SWISS;
                          break;
       case wxDEFAULT:
       default:           ff_family = FF_SWISS;

-                         ff_face = "Arial" ; 
+                         ff_face = _T("Arial") ; 

     }
 
     if (M_FONTDATA->m_style == wxITALIC || M_FONTDATA->m_style == wxSLANT)
     }
 
     if (M_FONTDATA->m_style == wxITALIC || M_FONTDATA->m_style == wxSLANT)


@@ -158,9 +158,9 @@ bool wxFont::RealizeResource(void)
     else if (M_FONTDATA->m_weight == wxBOLD)
       ff_weight = FW_BOLD;
 
     else if (M_FONTDATA->m_weight == wxBOLD)
       ff_weight = FW_BOLD;
 

-    const char* pzFace = (const char*) ff_face;
+    const wxChar* pzFace = (const wxChar*) ff_face;

     if (!M_FONTDATA->m_faceName.IsNull())
     if (!M_FONTDATA->m_faceName.IsNull())

-        pzFace = (const char*) M_FONTDATA->m_faceName ;
+        pzFace = (const wxChar*) M_FONTDATA->m_faceName ;

 
 /* Always calculate fonts using the screen DC (is this the best strategy?)
  * There may be confusion if a font is selected into a printer
 
 /* Always calculate fonts using the screen DC (is this the best strategy?)
  * There may be confusion if a font is selected into a printer


@@ -206,7 +206,7 @@ bool wxFont::RealizeResource(void)
                 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
                 PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
 #ifdef WXDEBUG_CREATE
                 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
                 PROOF_QUALITY, DEFAULT_PITCH | ff_family, pzFace);
 #ifdef WXDEBUG_CREATE

-    if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ;
+    if (m_hFont==NULL) wxError(_T("Cannot create font"),_T("Internal Error")) ;

 #endif
     return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
   }
 #endif
     return (M_FONTDATA->m_hFont != (WXHFONT) NULL);
   }


@@ -308,29 +308,29 @@ void wxFont::SetUnderlined(bool underlined)
 
 wxString wxFont::GetFamilyString(void) const
 {
 
 wxString wxFont::GetFamilyString(void) const
 {

-  wxString fam("");
+  wxString fam(_T(""));

   switch (GetFamily())
   {
     case wxDECORATIVE:
   switch (GetFamily())
   {
     case wxDECORATIVE:

-      fam = "wxDECORATIVE";
+      fam = _T("wxDECORATIVE");

       break;
     case wxROMAN:
       break;
     case wxROMAN:

-      fam = "wxROMAN";
+      fam = _T("wxROMAN");

       break;
     case wxSCRIPT:
       break;
     case wxSCRIPT:

-      fam = "wxSCRIPT";
+      fam = _T("wxSCRIPT");

       break;
     case wxSWISS:
       break;
     case wxSWISS:

-      fam = "wxSWISS";
+      fam = _T("wxSWISS");

       break;
     case wxMODERN:
       break;
     case wxMODERN:

-      fam = "wxMODERN";
+      fam = _T("wxMODERN");

       break;
     case wxTELETYPE:
       break;
     case wxTELETYPE:

-      fam = "wxTELETYPE";
+      fam = _T("wxTELETYPE");

       break;
     default:
       break;
     default:

-      fam = "wxDEFAULT";
+      fam = _T("wxDEFAULT");

       break;
   }
   return fam;
       break;
   }
   return fam;


@@ -338,7 +338,7 @@ wxString wxFont::GetFamilyString(void) const
 
 wxString wxFont::GetFaceName(void) const
 {
 
 wxString wxFont::GetFaceName(void) const
 {

-  wxString str("");
+  wxString str(_T(""));

   if (M_FONTDATA)
        str = M_FONTDATA->m_faceName ;
   return str;
   if (M_FONTDATA)
        str = M_FONTDATA->m_faceName ;
   return str;


@@ -346,17 +346,17 @@ wxString wxFont::GetFaceName(void) const
 
 wxString wxFont::GetStyleString(void) const
 {
 
 wxString wxFont::GetStyleString(void) const
 {

-  wxString styl("");
+  wxString styl(_T(""));

   switch (GetStyle())
   {
     case wxITALIC:
   switch (GetStyle())
   {
     case wxITALIC:

-      styl = "wxITALIC";
+      styl = _T("wxITALIC");

       break;
     case wxSLANT:
       break;
     case wxSLANT:

-      styl = "wxSLANT";
+      styl = _T("wxSLANT");

       break;
     default:
       break;
     default:

-      styl = "wxNORMAL";
+      styl = _T("wxNORMAL");

       break;
   }
   return styl;
       break;
   }
   return styl;


@@ -364,17 +364,17 @@ wxString wxFont::GetStyleString(void) const
 
 wxString wxFont::GetWeightString(void) const
 {
 
 wxString wxFont::GetWeightString(void) const
 {

-  wxString w("");
+  wxString w(_T(""));

   switch (GetWeight())
   {
     case wxBOLD:
   switch (GetWeight())
   {
     case wxBOLD:

-      w = "wxBOLD";
+      w = _T("wxBOLD");

       break;
     case wxLIGHT:
       break;
     case wxLIGHT:

-      w = "wxLIGHT";
+      w = _T("wxLIGHT");

       break;
     default:
       break;
     default:

-      w = "wxNORMAL";
+      w = _T("wxNORMAL");

       break;
   }
   return w;
       break;
   }
   return w;