X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9923c37dccb4e5dbe6387ceb3ab0a8202fadc231..cf283a470ab3eb4bc69959e3b5ae0edf30337fa5:/src/os2/fontdlg.cpp?ds=sidebyside diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp index c2b6091965..1024e1b98e 100644 --- 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 @@ -13,23 +13,23 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/fontdlg.h" + #ifndef WX_PRECOMP -#include -#include "wx/defs.h" -#include "wx/utils.h" -#include "wx/dialog.h" + #include + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/math.h" + #include "wx/cmndata.h" #endif -#include "wx/fontdlg.h" #include "wx/fontutil.h" #define INCL_PM #include #include "wx/os2/private.h" -#include "wx/cmndata.h" -#include #include #include @@ -37,10 +37,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) 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'; @@ -91,11 +91,10 @@ int wxFontDialog::ShowModal() 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 -