Avoid crash if user aborts the print

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

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 17e009349dc49072a01a707bbdd338da6e51c399..1024e1b98e2af9825e3975d31c483d3f7a9c5b2f 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxFontDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      David Webster


@@ -7,29 +7,29 @@
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/06/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
+    #include "wx/cmndata.h"

 #endif
 
 #endif
 

-#include "wx/fontdlg.h"

 #include "wx/fontutil.h"
 
 #define INCL_PM
 #include <os2.h>
 
 #include "wx/os2/private.h"
 #include "wx/fontutil.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>
 


@@ -37,10 +37,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
 int wxFontDialog::ShowModal()
 {
 
 int wxFontDialog::ShowModal()
 {

-    FONTDLG                         vFontDlg;
-    char                            zCurrentFont[FACESIZE];
-    HWND                            hWndFontDlg;
-    FACENAMEDESC                    vFn;
+    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';


@@ -91,11 +91,10 @@ int wxFontDialog::ShowModal()
         vChosenFont.SetPointSize(nPointSize);
         m_fontData.m_chosenFont = vChosenFont;
 
         vChosenFont.SetPointSize(nPointSize);
         m_fontData.m_chosenFont = vChosenFont;
 

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

-