Applied dir control token patch.

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 841c3b56fd57c9232d7a1f01d876b3427cd3645e..e6794d8d402a69e0473670c2c53f145ad60f24e6 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -18,9 +18,11 @@
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/fontdlg.h"
+#include "wx/fontutil.h"
 
 #define INCL_PM
 #include <os2.h>
@@ -28,42 +30,72 @@
 #include "wx/os2/private.h"
 #include "wx/cmndata.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
 
-/*
- * wxFontDialog
- */
-wxFontDialog::wxFontDialog()
+int wxFontDialog::ShowModal()
 {
-    m_dialogParent = NULL;
-}
+    FONTDLG                         vFontDlg;
+    char                            zCurrentFont[FACESIZE];
+    HWND                            hWndFontDlg;
+    FACENAMEDESC                    vFn;
 
-wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
-{
-    Create(parent, data);
-}
+    memset(&vFontDlg, '\0', sizeof(FONTDLG));
+    zCurrentFont[0] = '\0';
 
-bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
-{
-    m_dialogParent = parent;
+    //
+    // Set the fontdlg fields
+    //
+    vFontDlg.cbSize         = sizeof(FONTDLG);
+    vFontDlg.hpsScreen      = ::WinGetScreenPS(HWND_DESKTOP);
+    vFontDlg.hpsPrinter     = NULL;
+    vFontDlg.pszFamilyname  = zCurrentFont;
+    vFontDlg.fxPointSize    = MAKEFIXED(12,0);
+    vFontDlg.usFamilyBufLen = FACESIZE;
+    vFontDlg.fl             = FNTS_CENTER;
+    vFontDlg.clrFore        = CLR_BLACK;
+    vFontDlg.clrBack        = CLR_WHITE;
 
-    if (data)
-        m_fontData = *data;
-    return TRUE;
-}
+    hWndFontDlg = WinFontDlg( HWND_DESKTOP
+                             ,GetParent()->GetHWND()
+                             ,&vFontDlg
+                            );
+    if (hWndFontDlg && vFontDlg.lReturn == DID_OK)
+    {
+        wxColour                    vColour((unsigned long)0x00000000);
+        wxNativeFontInfo            vInfo;
 
-int wxFontDialog::ShowModal()
-{
-    // TODO: show (maybe create) the dialog
+        m_fontData.m_fontColour = vColour;
+
+        memset(&vFn, '\0', sizeof(FACENAMEDESC));
+        vFn.usSize        = sizeof(FACENAMEDESC);
+        vFn.usWeightClass = vFontDlg.usWeight;
+        vFn.usWidthClass  = vFontDlg.usWidth;
+
+        memset(&vInfo.fa, '\0', sizeof(FATTRS));
+        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);
+
+        int                         nPointSize = vFontDlg.fxPointSize >> 16;
+
+        vChosenFont.SetPointSize(nPointSize);
+        m_fontData.m_chosenFont = vChosenFont;
+
+        m_fontData.EncodingInfo().facename = vFontDlg.fAttrs.szFacename;
+        m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;
+
+        return wxID_OK;
+    }
     return wxID_CANCEL;
-}
+} // end of wxFontDialg::ShowModal