Weekly catchup as well as better font and fontdlg support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-19 02:28:02 +00:00
parent c93f804a15
commit a23692f070
8 changed files with 207 additions and 76 deletions
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -81,14 +81,16 @@ int wxFontDialog::ShowModal()
        // Debugging
        //
        wxFont                      vChosenFont(vInfo);
+
        int                         nFamily;
-        int                         nPointSize;
+        int                         nPointSize = vFontDlg.lEmHeight;
        int                         nStyle;
        int                         nWeight;
        bool                        bUnderlined;
        wxString                    sFaceName;
        wxNativeFontInfo*           pInfo;

+        vChosenFont.SetPointSize(nPointSize);
        nFamily = vChosenFont.GetFamily();
        nPointSize = vChosenFont.GetPointSize();
        nStyle = vChosenFont.GetStyle();