X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..4bc0f25ed7eefb4a6fbeb61189a4c12023b9730f:/src/msw/fontdlg.cpp

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index c489e93c64..bffa169a38 100644
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontdlg.h"
 #endif
 
@@ -37,12 +37,12 @@
 #endif
 
 #include "wx/fontdlg.h"
+#include "wx/msw/private.h"
 
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
-    #include <commdlg.h>
+#if !defined(__WIN32__) || defined(__WXWINCE__)
+#include <commdlg.h>
 #endif
 
-#include "wx/msw/private.h"
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
@@ -64,27 +64,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 // wxFontDialog
 // ----------------------------------------------------------------------------
 
-wxFontDialog::wxFontDialog()
-{
-    m_parent = NULL;
-}
-
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
-{
-    Create(parent, data);
-}
-
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
-{
-    m_parent = parent;
-
-    wxCHECK_MSG( data, FALSE, _T("no font data in wxFontDialog") );
-
-    m_fontData = *data;
-
-    return TRUE;
-}
-
 int wxFontDialog::ShowModal()
 {
     DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;
@@ -99,23 +78,25 @@ int wxFontDialog::ShowModal()
         chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
     chooseFontStruct.lpLogFont = &logFont;
 
-    if ( m_fontData.initialFont.Ok() )
+    if ( m_fontData.m_initialFont.Ok() )
     {
         flags |= CF_INITTOLOGFONTSTRUCT;
-        wxFillLogFont(&logFont, &m_fontData.initialFont);
+        wxFillLogFont(&logFont, &m_fontData.m_initialFont);
     }
 
-    chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
+    if ( m_fontData.m_fontColour.Ok() )
+    {
+        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
+
+        // need this for the colour to be taken into account
+        flags |= CF_EFFECTS;
+    }
 
     // CF_ANSIONLY flag is obsolete for Win32
     if ( !m_fontData.GetAllowSymbols() )
     {
-#ifdef __WIN16__
-      flags |= CF_ANSIONLY;
-#else // Win32
       flags |= CF_SELECTSCRIPT;
       logFont.lfCharSet = ANSI_CHARSET;
-#endif // Win16/32
     }
 
     if ( m_fontData.GetEnableEffects() )
@@ -123,10 +104,10 @@ int wxFontDialog::ShowModal()
     if ( m_fontData.GetShowHelp() )
       flags |= CF_SHOWHELP;
 
-    if ( m_fontData.minSize != 0 || m_fontData.maxSize != 0 )
+    if ( m_fontData.m_minSize != 0 || m_fontData.m_maxSize != 0 )
     {
-        chooseFontStruct.nSizeMin = m_fontData.minSize;
-        chooseFontStruct.nSizeMax = m_fontData.maxSize;
+        chooseFontStruct.nSizeMin = m_fontData.m_minSize;
+        chooseFontStruct.nSizeMax = m_fontData.m_maxSize;
         flags |= CF_LIMITSIZE;
     }
 
@@ -134,8 +115,8 @@ int wxFontDialog::ShowModal()
 
     if ( ChooseFont(&chooseFontStruct) != 0 )
     {
-        wxRGBToColour(m_fontData.fontColour, chooseFontStruct.rgbColors);
-        m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
+        wxRGBToColour(m_fontData.m_fontColour, chooseFontStruct.rgbColors);
+        m_fontData.m_chosenFont = wxCreateFontFromLogFont(&logFont);
         m_fontData.EncodingInfo().facename = logFont.lfFaceName;
         m_fontData.EncodingInfo().charset = logFont.lfCharSet;