X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4353f07c6b37712634d4b2d86527b647a08044f..5219cf0588852d7f1cfeab0df74314589a9d1e22:/src/os2/fontdlg.cpp?ds=sidebyside diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp index e75040cc76..676695ac3c 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,22 +13,22 @@ // 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" #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 @@ -36,11 +36,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) int wxFontDialog::ShowModal() { - FONTDLG vFontDlg; - char zCurrentFont[FACESIZE]; - HWND hWndFontDlg; - FONTMETRICS vFm; - FACENAMEDESC vFn; + FONTDLG vFontDlg; + char zCurrentFont[FACESIZE]; + HWND hWndFontDlg; + FACENAMEDESC vFn; memset(&vFontDlg, '\0', sizeof(FONTDLG)); zCurrentFont[0] = '\0'; @@ -67,7 +66,7 @@ int wxFontDialog::ShowModal() wxColour vColour((unsigned long)0x00000000); wxNativeFontInfo vInfo; - m_fontData.fontColour = vColour; + m_fontData.m_fontColour = vColour; memset(&vFn, '\0', sizeof(FACENAMEDESC)); vFn.usSize = sizeof(FACENAMEDESC); @@ -89,13 +88,12 @@ int wxFontDialog::ShowModal() int nPointSize = vFontDlg.fxPointSize >> 16; vChosenFont.SetPointSize(nPointSize); - m_fontData.chosenFont = vChosenFont; + 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 -