1. minor fixes in wxDynLib

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index d2c23a9d410b806d9958e65a71e2ee8d0687f3f9..c68ffd6d2e78bf5ca9e7482139adf11cb0826fbe 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -31,7 +31,7 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)

 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #endif
 


@@ -174,7 +174,7 @@ void wxFillLogFont(LOGFONT *logFont, wxFont *font)
     // up fonts. So, set ppInch to a constant 96 dpi.
     ppInch = 96;
 
     // up fonts. So, set ppInch to a constant 96 dpi.
     ppInch = 96;
 

-#if FONT_SIZE_COMPATIBILITY
+#if wxFONT_SIZE_COMPATIBILITY

     // Incorrect, but compatible with old wxWindows behaviour
     int nHeight = (font->GetPointSize()*ppInch/72);
 #else
     // Incorrect, but compatible with old wxWindows behaviour
     int nHeight = (font->GetPointSize()*ppInch/72);
 #else


@@ -199,7 +199,7 @@ void wxFillLogFont(LOGFONT *logFont, wxFont *font)
     logFont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
     logFont->lfQuality = PROOF_QUALITY;
     logFont->lfPitchAndFamily = DEFAULT_PITCH | ff_family;
     logFont->lfClipPrecision = CLIP_DEFAULT_PRECIS;
     logFont->lfQuality = PROOF_QUALITY;
     logFont->lfPitchAndFamily = DEFAULT_PITCH | ff_family;

-    strcpy(logFont->lfFaceName, ff_face);
+    wxStrcpy(logFont->lfFaceName, ff_face);

 }
 
 wxFont wxCreateFontFromLogFont(LOGFONT *logFont) // , bool createNew)
 }
 
 wxFont wxCreateFontFromLogFont(LOGFONT *logFont) // , bool createNew)


@@ -209,7 +209,7 @@ wxFont wxCreateFontFromLogFont(LOGFONT *logFont) // , bool createNew)
   int fontWeight = wxNORMAL;
   int fontPoints = 10;
   bool fontUnderline = FALSE;
   int fontWeight = wxNORMAL;
   int fontPoints = 10;
   bool fontUnderline = FALSE;

-  char *fontFace = NULL;
+  wxChar *fontFace = NULL;

 
 //  int lfFamily = logFont->lfPitchAndFamily & 0xF0;
   int lfFamily = logFont->lfPitchAndFamily;
 
 //  int lfFamily = logFont->lfPitchAndFamily & 0xF0;
   int lfFamily = logFont->lfPitchAndFamily;