compilation fixes - wxGTK compiles but not links

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

diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index c4392218bdfd8a7fbf3646c8a131d18dc03f6942..a2a73706edc3ebbec09d367ef5a995b7fd1cad8f 100644 (file)
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -41,6 +41,7 @@
 #include "wx/tokenzr.h"
 
 #include "wx/msw/private.h"
 #include "wx/tokenzr.h"
 
 #include "wx/msw/private.h"

+#include "wx/tokenzr.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 


@@ -218,16 +219,10 @@ void wxFontRefData::Init(const wxNativeFontInfo& info)
 
     m_faceName = info.lf.lfFaceName;
 
 
     m_faceName = info.lf.lfFaceName;
 

-    // remember that 1pt = 1/72inch

     int height = abs(info.lf.lfHeight);
 
     int height = abs(info.lf.lfHeight);
 

-#if wxUSE_SCREEN_DPI
-    HDC dc = ::GetDC(NULL);
-    static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
-    ::ReleaseDC(NULL, dc);
-#else
-    static const int ppInch = 96;
-#endif
+    // remember that 1pt = 1/72inch
+    const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);

     m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
 
     m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);
     m_pointSize = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
 
     m_encoding = wxGetFontEncFromCharSet(info.lf.lfCharSet);


@@ -296,42 +291,42 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfItalic = l;
+    lf.lfItalic = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfUnderline = l;
+    lf.lfUnderline = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfStrikeOut = l;
+    lf.lfStrikeOut = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfCharSet = l;
+    lf.lfCharSet = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfOutPrecision = l;
+    lf.lfOutPrecision = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfClipPrecision = l;
+    lf.lfClipPrecision = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfQuality = l;
+    lf.lfQuality = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;
 
     token = tokenizer.GetNextToken();
     if ( !token.ToLong(&l) )
         return FALSE;

-    lf.lfPitchAndFamily = l;
+    lf.lfPitchAndFamily = (BYTE)l;

 
     token = tokenizer.GetNextToken();
     if(!token)
 
     token = tokenizer.GetNextToken();
     if(!token)


@@ -456,7 +451,7 @@ bool wxFont::RealizeResource()
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxFont::FreeResource(bool force)
+bool wxFont::FreeResource(bool WXUNUSED(force))

 {
     if ( GetResourceHandle() )
     {
 {
     if ( GetResourceHandle() )
     {


@@ -650,11 +645,115 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+    long l;
+
+    wxStringTokenizer tokenizer(s, _T(";"));
+
+    wxString token = tokenizer.GetNextToken();
+    //
+    //  Ignore the version for now
+    //
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfHeight = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfWidth = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfEscapement = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfOrientation = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfWeight = l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfItalic = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfUnderline = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfStrikeOut = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfCharSet = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfOutPrecision = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfClipPrecision = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfQuality = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return FALSE;
+    lf.lfPitchAndFamily = (BYTE)l;
+
+    token = tokenizer.GetNextToken();
+    if(!token)
+        return FALSE;
+    wxStrcpy(lf.lfFaceName, token.c_str());
+
+    return TRUE;
+}
+
+wxString wxNativeFontInfo::ToString() const

 {
 {

-    if( M_FONTDATA->m_nativeFontInfoOk )
-        return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    wxString s;
+
+    s.Printf(_T("%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+             0, // version, in case we want to change the format later
+             lf.lfHeight,
+             lf.lfWidth,
+             lf.lfEscapement,
+             lf.lfOrientation,
+             lf.lfWeight,
+             lf.lfItalic,
+             lf.lfUnderline,
+             lf.lfStrikeOut,
+             lf.lfCharSet,
+             lf.lfOutPrecision,
+             lf.lfClipPrecision,
+             lf.lfQuality,
+             lf.lfPitchAndFamily,
+             lf.lfFaceName);

 
 

-    return 0;
+    return s;

 }
 
 }