Fixed Refresh to clip update rectangles to the visible area of a

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 9b796e6527df4be18931695deb82a45556d77052..e75040cc761fad2ffc10fc3e677f87f48658a303 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -74,42 +74,23 @@ int wxFontDialog::ShowModal()
         vFn.usWeightClass = vFontDlg.usWeight;
         vFn.usWidthClass  = vFontDlg.usWidth;
 
         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 = vFontDlg.lEmHeight;
-        int                         nStyle;
-        int                         nWeight;
-        bool                        bUnderlined;
-        wxString                    sFaceName;
-        wxNativeFontInfo*           pInfo;
+        int                         nPointSize = vFontDlg.fxPointSize >> 16;

 
         vChosenFont.SetPointSize(nPointSize);
 
         vChosenFont.SetPointSize(nPointSize);

-        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;
 
         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;
         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;
 
         m_fontData.EncodingInfo().facename = vFontDlg.fAttrs.szFacename;
         m_fontData.EncodingInfo().charset = vFontDlg.fAttrs.usCodePage;