X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd76344ecccc8d80f05ebb01cd7f7dd13ef77c3c..4e15d1caa03346c126015019c1fdf093033ef40b:/src/msw/printdlg.cpp?ds=sidebyside diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 857be199c4..7cf410702c 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -39,6 +39,7 @@ #include "wx/msw/printdlg.h" #include "wx/msw/dcprint.h" #include "wx/paper.h" +#include "wx/testing.h" #include <stdlib.h> @@ -65,7 +66,7 @@ public: BOOL Open( const wxString& printerName, LPPRINTER_DEFAULTS pDefault=(LPPRINTER_DEFAULTS)NULL ) { Close(); - return OpenPrinter( (LPTSTR)printerName.wx_str(), &m_hPrinter, pDefault ); + return OpenPrinter( wxMSW_CONV_LPTSTR(printerName), &m_hPrinter, pDefault ); } BOOL Close() @@ -391,7 +392,7 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi if (m_devMode) return; - LPTSTR szPrinterName = (LPTSTR)printerName.wx_str(); + LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(printerName); // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function // The purpose of this is to fill the DEVMODE with privdata from printer driver. @@ -494,7 +495,7 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) { WinPrinter printer; - LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str(); + LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(data.GetPrinterName()); if (!m_devMode) InitializeDevMode(data.GetPrinterName(), &printer); @@ -524,7 +525,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) // NB: the cast is needed in the ANSI build, strangely enough // dmDeviceName is BYTE[] and not char[] there wxStrlcpy(reinterpret_cast<wxChar *>(devMode->dmDeviceName), - name.wx_str(), + name.t_str(), WXSIZEOF(devMode->dmDeviceName)); } @@ -738,6 +739,8 @@ wxWindowsPrintDialog::~wxWindowsPrintDialog() int wxWindowsPrintDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + ConvertToNative( m_printDialogData ); PRINTDLG *pd = (PRINTDLG*) m_printDlg; @@ -957,6 +960,8 @@ wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog() int wxWindowsPageSetupDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + ConvertToNative( m_pageSetupData ); PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;