added wxXmlResource::FindXRCIDById() (#10026)

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

diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp
index 75fcd09d3883a383c3717cef460091e2050d4fd6..51a5bd1b2b47fbb0bb9c409176424a75d8841191 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,24 +26,17 @@
 
 #if wxUSE_FONTDLG
 
 
 #if wxUSE_FONTDLG
 

+#include "wx/fontdlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"
+    #include "wx/msw/wrapcdlg.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

+    #include "wx/log.h"
+    #include "wx/cmndata.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"
-
-#if !defined(__WIN32__) || defined(__SALFORDC__)
-#include <windows.h>
-#include <commdlg.h>
-#endif
-
-#include "wx/msw/private.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
-
-#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 


@@ -67,7 +56,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

-    DWORD flags = CF_SCREENFONTS | CF_NOSIMULATIONS;
+    // It should be OK to always use GDI simulations
+    DWORD flags = CF_SCREENFONTS /* | CF_NOSIMULATIONS */ ;

 
     LOGFONT logFont;
 
 
     LOGFONT logFont;
 


@@ -79,29 +69,22 @@ int wxFontDialog::ShowModal()
         chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
     chooseFontStruct.lpLogFont = &logFont;
 
         chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
     chooseFontStruct.lpLogFont = &logFont;
 

-    if ( m_fontData.initialFont.Ok() )
+    if ( m_fontData.m_initialFont.Ok() )

     {
         flags |= CF_INITTOLOGFONTSTRUCT;
     {
         flags |= CF_INITTOLOGFONTSTRUCT;

-        wxFillLogFont(&logFont, &m_fontData.initialFont);
+        wxFillLogFont(&logFont, &m_fontData.m_initialFont);

     }
 
     }
 

-    if ( m_fontData.fontColour.Ok() )
+    if ( m_fontData.m_fontColour.Ok() )

     {
     {

-        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
-
-        // need this for the colour to be taken into account
-        flags |= CF_EFFECTS;
+        chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);

     }
 
     // CF_ANSIONLY flag is obsolete for Win32
     if ( !m_fontData.GetAllowSymbols() )
     {
     }
 
     // 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;
       flags |= CF_SELECTSCRIPT;
       logFont.lfCharSet = ANSI_CHARSET;

-#endif // Win16/32

     }
 
     if ( m_fontData.GetEnableEffects() )
     }
 
     if ( m_fontData.GetEnableEffects() )


@@ -109,10 +92,10 @@ int wxFontDialog::ShowModal()
     if ( m_fontData.GetShowHelp() )
       flags |= CF_SHOWHELP;
 
     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;
     }
 
         flags |= CF_LIMITSIZE;
     }
 


@@ -120,8 +103,8 @@ int wxFontDialog::ShowModal()
 
     if ( ChooseFont(&chooseFontStruct) != 0 )
     {
 
     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;
 
         m_fontData.EncodingInfo().facename = logFont.lfFaceName;
         m_fontData.EncodingInfo().charset = logFont.lfCharSet;