Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 147a590720501b900fec5d20e211f40f9255b129..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,7 +30,6 @@
 #include "wx/os2/private.h"
 #include "wx/cmndata.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -39,7 +40,6 @@ int wxFontDialog::ShowModal()
     FONTDLG                         vFontDlg;
     char                            zCurrentFont[FACESIZE];
     HWND                            hWndFontDlg;
-    FONTMETRICS                     vFm;
     FACENAMEDESC                    vFn;
 
     memset(&vFontDlg, '\0', sizeof(FONTDLG));