Add virtual ~wxAnyScrollHelperBase() to fix compiler warning.

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 1cb0f7981b0bf46dceb686d08dc101c2f48c85de..fc1c4d8b2793eca636c16ac7be8748819c6e6168 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.cpp
+// Name:        src/os2/fontdlg.cpp

 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,22 +12,23 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/fontdlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
+    #include <stdio.h>
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"
+#include "wx/fontutil.h"
+#include "wx/modalhook.h"

 
 #define INCL_PM
 #include <os2.h>
 
 #include "wx/os2/private.h"
 
 #define INCL_PM
 #include <os2.h>
 
 #include "wx/os2/private.h"

-#include "wx/cmndata.h"

 
 

-#include <math.h>

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


@@ -36,11 +36,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

-    FONTDLG                         vFontDlg;
-    char                            zCurrentFont[FACESIZE];
-    HWND                            hWndFontDlg;
-    FONTMETRICS                     vFm;
-    FACENAMEDESC                    vFn;
+    WX_HOOK_MODAL_DIALOG();
+
+    FONTDLG      vFontDlg;
+    char         zCurrentFont[FACESIZE];
+    HWND         hWndFontDlg;
+    FACENAMEDESC vFn;

 
     memset(&vFontDlg, '\0', sizeof(FONTDLG));
     zCurrentFont[0] = '\0';
 
     memset(&vFontDlg, '\0', sizeof(FONTDLG));
     zCurrentFont[0] = '\0';


@@ -67,52 +68,34 @@ 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);
         vFn.usWeightClass = vFontDlg.usWeight;
         vFn.usWidthClass  = vFontDlg.usWidth;
 
 
         memset(&vFn, '\0', sizeof(FACENAMEDESC));
         vFn.usSize        = sizeof(FACENAMEDESC);
         vFn.usWeightClass = vFontDlg.usWeight;
         vFn.usWidthClass  = vFontDlg.usWidth;
 

-        memcpy(&vInfo.fa, &vFontDlg.fAttrs, sizeof(FATTRS));
+        memset(&vInfo.fa, '\0', sizeof(FATTRS));

         memcpy(&vInfo.fn, &vFn, sizeof(FACENAMEDESC));
 
         memcpy(&vInfo.fn, &vFn, sizeof(FACENAMEDESC));
 

+        vInfo.fa.usRecordLength = vFontDlg.fAttrs.usRecordLength;
+        strcpy(vInfo.fa.szFacename, vFontDlg.fAttrs.szFacename);
+        vInfo.fa.lMatch = vFontDlg.fAttrs.lMatch;
+

         //
         // Debugging
         //
         wxFont                      vChosenFont(vInfo);
         //
         // Debugging
         //
         wxFont                      vChosenFont(vInfo);

-        int                         nFamily;
-        int                         nPointSize;
-        int                         nStyle;
-        int                         nWeight;
-        bool                        bUnderlined;
-        wxString                    sFaceName;
-        wxNativeFontInfo*           pInfo;
-
-        nFamily = vChosenFont.GetFamily();
-        nPointSize = vChosenFont.GetPointSize();
-        nStyle = vChosenFont.GetStyle();
-        nWeight = vChosenFont.GetWeight();
-        bUnderlined = vChosenFont.GetUnderlined();
-        sFaceName = vChosenFont.GetFaceName();
-        pInfo = vChosenFont.GetNativeFontInfo();
-
-
-        m_fontData.chosenFont = vChosenFont;
-
-        nFamily = m_fontData.chosenFont.GetFamily();
-        nPointSize = m_fontData.chosenFont.GetPointSize();
-        nStyle = m_fontData.chosenFont.GetStyle();
-        nWeight = m_fontData.chosenFont.GetWeight();
-        bUnderlined = m_fontData.chosenFont.GetUnderlined();
-        sFaceName = m_fontData.chosenFont.GetFaceName();
-        pInfo = m_fontData.chosenFont.GetNativeFontInfo();
-
-        m_fontData.EncodingInfo().facename = vFontDlg.fAttrs.szFacename;
+
+        int                         nPointSize = vFontDlg.fxPointSize >> 16;
+
+        vChosenFont.SetPointSize(nPointSize);
+        m_fontData.m_chosenFont = vChosenFont;
+
+        m_fontData.EncodingInfo().facename = (wxChar*)vFontDlg.fAttrs.szFacename;

         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;
 
         return wxID_OK;
     }
     return wxID_CANCEL;
 } // end of wxFontDialg::ShowModal
         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;
 
         return wxID_OK;
     }
     return wxID_CANCEL;
 } // end of wxFontDialg::ShowModal

-