Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert r68416 which should not have been committed to this tag.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_9_2@68490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-08-02 19:41:38 +00:00
parent b8feb5f6ee
commit 0184ae1ee9
2 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/printdlg.h
View File

@@ -20,7 +20,6 @@
#include "wx/printdlg.h" #include "wx/printdlg.h"
class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxDC;
class WinPrinter;
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// wxWindowsPrintNativeData // wxWindowsPrintNativeData
@@ -38,7 +37,6 @@ public:
virtual bool Ok() const { return IsOk(); } virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const;
void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
void* GetDevMode() const { return m_devMode; } void* GetDevMode() const { return m_devMode; }
void SetDevMode(void* data) { m_devMode = data; } void SetDevMode(void* data) { m_devMode = data; }
void* GetDevNames() const { return m_devNames; } void* GetDevNames() const { return m_devNames; }

36
src/msw/printdlg.cpp
View File

@@ -192,9 +192,6 @@ bool wxWindowsPrintNativeData::IsOk() const
bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
{ {
if ( !m_devMode )
InitializeDevMode();
if ( !m_devMode ) if ( !m_devMode )
return false; return false;
@@ -386,21 +383,20 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
return true; return true;
} }
void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, WinPrinter* printer) bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
{ {
if (m_devMode) HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);
return; WinPrinter printer;
LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
LPTSTR szPrinterName = (LPTSTR)printerName.wx_str();
// From MSDN: How To Modify Printer Settings with the DocumentProperties() Function // 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. // The purpose of this is to fill the DEVMODE with privdata from printer driver.
// If we have a printer name and OpenPrinter sucessfully returns // If we have a printer name and OpenPrinter sucessfully returns
// this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer. // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer.
if ( !m_devMode && !printerName.IsEmpty() ) if ( !m_devMode && !data.GetPrinterName().IsEmpty() )
{ {
// Open printer // Open printer
if ( printer && printer->Open( printerName ) == TRUE ) if ( printer.Open( data.GetPrinterName() ) == TRUE )
{ {
DWORD dwNeeded, dwRet; DWORD dwNeeded, dwRet;
@@ -428,11 +424,12 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
{ {
// If failure, cleanup // If failure, cleanup
GlobalFree( tempDevMode ); GlobalFree( tempDevMode );
printer->Close(); printer.Close();
} }
else else
{ {
m_devMode = tempDevMode; hDevMode = tempDevMode;
m_devMode = hDevMode;
tempDevMode = NULL; tempDevMode = NULL;
} }
} }
@@ -474,7 +471,8 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
} }
else else
{ {
m_devMode = pd.hDevMode; hDevMode = pd.hDevMode;
m_devMode = hDevMode;
pd.hDevMode = NULL; pd.hDevMode = NULL;
// We'll create a new DEVNAMEs structure below. // We'll create a new DEVNAMEs structure below.
@@ -489,18 +487,6 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
} }
} }
}
bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
{
WinPrinter printer;
LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
if (!m_devMode)
InitializeDevMode(data.GetPrinterName(), &printer);
HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);
if ( hDevMode ) if ( hDevMode )
{ {
GlobalPtrLock lockDevMode(hDevMode); GlobalPtrLock lockDevMode(hDevMode);