Initialize the native printer info for ConvertFromNative if it hasn't been done already.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 754e212f9f9a09d7d68d60d9c7c00811b291aebf..bcca2b91e9eed11b2ccef4ed6e7ec826671cbcad 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -20,6 +20,7 @@
 #include "wx/printdlg.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 #include "wx/printdlg.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;

+class WinPrinter;

 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData


@@ -37,6 +38,7 @@ public:
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
 
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
 

+    void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);

     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 205009999b142ba4ae042073a06f56b97b4fe203..fac6fdf7438aaffba63abb11dab564ddc7b59720 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -192,6 +192,9 @@ bool wxWindowsPrintNativeData::IsOk() const
 
 bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 {
 
 bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 {

+    if ( !m_devMode )
+        InitializeDevMode();
+

     if ( !m_devMode )
         return false;
 
     if ( !m_devMode )
         return false;
 


@@ -383,20 +386,21 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
     return true;
 }
 
     return true;
 }
 

-bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
+void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, WinPrinter* printer)

 {
 {

-    HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);
-    WinPrinter printer;
-    LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
+    if (m_devMode)
+        return;
+
+    LPTSTR szPrinterName = (LPTSTR)printerName.wx_str();

 
     // 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.
     // 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.
 
     // 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.
     // 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.

-    if ( !m_devMode && !data.GetPrinterName().IsEmpty() )
+    if ( !m_devMode && !printerName.IsEmpty() )

     {
         // Open printer
     {
         // Open printer

-        if ( printer.Open( data.GetPrinterName() ) == TRUE )
+        if ( printer && printer->Open( printerName ) == TRUE )

         {
             DWORD dwNeeded, dwRet;
 
         {
             DWORD dwNeeded, dwRet;
 


@@ -424,12 +428,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
             {
                 // If failure, cleanup
                 GlobalFree( tempDevMode );
             {
                 // If failure, cleanup
                 GlobalFree( tempDevMode );

-                printer.Close();
+                printer->Close();

             }
             else
             {
             }
             else
             {

-                hDevMode = tempDevMode;
-                m_devMode = hDevMode;
+                m_devMode = tempDevMode;

                 tempDevMode = NULL;
             }
         }
                 tempDevMode = NULL;
             }
         }


@@ -471,8 +474,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         }
         else
         {
         }
         else
         {

-            hDevMode = pd.hDevMode;
-            m_devMode = hDevMode;
+            m_devMode = pd.hDevMode;

             pd.hDevMode = NULL;
 
             // We'll create a new DEVNAMEs structure below.
             pd.hDevMode = NULL;
 
             // We'll create a new DEVNAMEs structure below.


@@ -487,6 +489,18 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         }
     }
 
         }
     }
 

+}
+
+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 )
     {
         GlobalPtrLock lockDevMode(hDevMode);
     if ( hDevMode )
     {
         GlobalPtrLock lockDevMode(hDevMode);