repaired some of the more obvious horrors in the contrib (configure) Makefiles

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 1564ebd8afdc1c807961fc633bb6e41116292167..db5ecb184a71ecb77d59e30f1e06b60930ca0cab 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -31,13 +31,11 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARIES
     IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
     #if wxUSE_PORTABLE_FONTS_IN_MSW
         IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
     #endif
-#endif
 
 // ----------------------------------------------------------------------------
 // wxFontRefData - the internal description of the font
@@ -193,7 +191,7 @@ bool wxFont::RealizeResource()
     {
         // VZ: the old code returned FALSE in this case, but it doesn't seem
         //     to make sense because the font _was_ created
-        wxLogDebug(T("Calling wxFont::RealizeResource() twice"));
+        wxLogDebug(wxT("Calling wxFont::RealizeResource() twice"));
 
        return TRUE;
     }
@@ -207,7 +205,7 @@ bool wxFont::RealizeResource()
     {
         case wxSCRIPT:
 //            ff_family = FF_SCRIPT ;
-            ff_face = T("Script") ;
+            ff_face = wxT("Script") ;
             break ;
 
         case wxDECORATIVE:
@@ -216,24 +214,24 @@ bool wxFont::RealizeResource()
 
         case wxROMAN:
 //            ff_family = FF_ROMAN;
-            ff_face = T("Times New Roman") ;
+            ff_face = wxT("Times New Roman") ;
             break;
 
         case wxTELETYPE:
         case wxMODERN:
 //            ff_family = FF_MODERN;
-            ff_face = T("Courier New") ;
+            ff_face = wxT("Courier New") ;
             break;
 
         case wxSWISS:
 //            ff_family = FF_SWISS;
-            ff_face = T("Arial") ;
+            ff_face = wxT("Arial") ;
             break;
 
         case wxDEFAULT:
         default:
 //            ff_family = FF_SWISS;
-            ff_face = T("Arial") ;
+            ff_face = wxT("Arial") ;
     }
 
     BYTE ff_italic;
@@ -245,7 +243,7 @@ bool wxFont::RealizeResource()
             break;
 
         default:
-            wxFAIL_MSG(T("unknown font slant"));
+            wxFAIL_MSG(wxT("unknown font slant"));
             // fall through
 
         case wxNORMAL:
@@ -256,7 +254,7 @@ bool wxFont::RealizeResource()
     switch ( M_FONTDATA->m_weight )
     {
         default:
-            wxFAIL_MSG(T("unknown font weight"));
+            wxFAIL_MSG(wxT("unknown font weight"));
             // fall through
 
         case wxNORMAL:
@@ -378,7 +376,7 @@ bool wxFont::RealizeResource()
             break;
 
         default:
-            wxFAIL_MSG(T("unsupported encoding"));
+            wxFAIL_MSG(wxT("unsupported encoding"));
             // fall through
 
         case wxFONTENCODING_SYSTEM:
@@ -387,7 +385,7 @@ bool wxFont::RealizeResource()
     }
 
 // TODO:
-WXHFONT hFont;
+WXHFONT hFont = 0;
 //    HFONT hFont = ::CreateFont
 //                  (
 //                   nHeight,             // height