Simplified OS X Panther detection code.

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index e75040cc761fad2ffc10fc3e677f87f48658a303..e1998a8058e1c0fdd8526b8a8e4b26ae5f623f8d 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include "wx/fontdlg.h"
 #endif
 
 #include "wx/fontdlg.h"

+#include "wx/fontutil.h"

 
 #define INCL_PM
 #include <os2.h>
 
 #define INCL_PM
 #include <os2.h>


@@ -67,7 +68,7 @@ int wxFontDialog::ShowModal()
         wxColour                    vColour((unsigned long)0x00000000);
         wxNativeFontInfo            vInfo;
 
         wxColour                    vColour((unsigned long)0x00000000);
         wxNativeFontInfo            vInfo;
 

-        m_fontData.fontColour = vColour;
+        m_fontData.m_fontColour = vColour;

 
         memset(&vFn, '\0', sizeof(FACENAMEDESC));
         vFn.usSize        = sizeof(FACENAMEDESC);
 
         memset(&vFn, '\0', sizeof(FACENAMEDESC));
         vFn.usSize        = sizeof(FACENAMEDESC);


@@ -89,7 +90,7 @@ int wxFontDialog::ShowModal()
         int                         nPointSize = vFontDlg.fxPointSize >> 16;
 
         vChosenFont.SetPointSize(nPointSize);
         int                         nPointSize = vFontDlg.fxPointSize >> 16;
 
         vChosenFont.SetPointSize(nPointSize);

-        m_fontData.chosenFont = vChosenFont;
+        m_fontData.m_chosenFont = vChosenFont;

 
         m_fontData.EncodingInfo().facename = vFontDlg.fAttrs.szFacename;
         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;
 
         m_fontData.EncodingInfo().facename = vFontDlg.fAttrs.szFacename;
         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;