Don't call StartingKey if the key was F2

[wxWidgets.git] / src / msw / printdlg.cpp

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 6a5a7e4fd552474b95725551c738538fe2569109..02892c45100bbaeae8049e8391bbf4bacb1abdfd 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -38,14 +38,13 @@
 
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"

+#include "wx/msw/printdlg.h"

 #include "wx/dcprint.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
 
 #include "wx/dcprint.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
 

-#include "wx/msw/private.h"
-
-#include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"

 
 #ifndef __WIN32__
     #include <print.h>
 
 #ifndef __WIN32__
     #include <print.h>


@@ -93,8 +92,8 @@ static wxString wxGetPrintDlgError()
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;

-    // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
-    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+    // if (!driverName.empty() && !printerName.empty() && !portName.empty())
+    if (driverName.empty() && printerName.empty() && portName.empty())

     {
     }
     else
     {
     }
     else


@@ -247,7 +246,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;

-                default:    
+                default:

                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }
                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }


@@ -278,6 +277,11 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
         else
             data.SetQuality( wxPRINT_QUALITY_HIGH );
 
         else
             data.SetQuality( wxPRINT_QUALITY_HIGH );
 

+        if (devMode->dmDriverExtra > 0)
+            data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
+        else
+            data.SetPrivData( NULL, 0 );
+

         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }
 


@@ -296,15 +300,15 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
             // Not sure if we should check for this mismatch
             wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
             // Not sure if we should check for this mismatch

-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+//            wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");

 
 

-            if (printerName != wxT(""))
+            if (!printerName.empty())

                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }
                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -390,7 +394,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 
         //// Printer name
         wxString name = data.GetPrinterName();
 
         //// Printer name
         wxString name = data.GetPrinterName();

-        if (name != wxT(""))
+        if (!name.empty())

         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);


@@ -469,6 +473,12 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
 
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
 

+        if (data.GetPrivDataLen() > 0)
+        {
+            memcpy( (char *)devMode+devMode->dmSize, data.GetPrivData(), data.GetPrivDataLen() );
+            devMode->dmDriverExtra = (WXWORD)data.GetPrivDataLen();
+        }
+

         if (data.GetBin() != wxPRINTBIN_DEFAULT)
         {
             switch (data.GetBin())
         if (data.GetBin() != wxPRINTBIN_DEFAULT)
         {
             switch (data.GetBin())


@@ -504,11 +514,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.

-    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), data.GetPrinterName(), wxT(""));
-    
+    m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+

     return true;
 }
     return true;
 }

-    
+

 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------


@@ -537,7 +547,7 @@ bool wxWindowsPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 
     // MSW handle
     m_printDlg = NULL;
 
     // MSW handle
     m_printDlg = NULL;

-    
+

     if ( data )
         m_printDialogData = *data;
 
     if ( data )
         m_printDialogData = *data;
 


@@ -561,7 +571,7 @@ int wxWindowsPrintDialog::ShowModal()
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;

-    
+

     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())


@@ -602,13 +612,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();

-    
+

     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-    
+

     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;


@@ -625,7 +635,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;

-    
+

     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)
     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)


@@ -694,7 +704,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -706,7 +716,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-    
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -751,28 +761,28 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );

-#endif    
+#endif

     return true;
 }
 
 // ---------------------------------------------------------------------------
     return true;
 }
 
 // ---------------------------------------------------------------------------

-// wxPageSetupDialog
+// wxWidnowsPageSetupDialog

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
+IMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase)

 
 

-wxPageSetupDialog::wxPageSetupDialog()
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog()

 {
     m_dialogParent = NULL;
     m_pageDlg = NULL;
 }
 
 {
     m_dialogParent = NULL;
     m_pageDlg = NULL;
 }
 

-wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data)
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data)

 {
     Create(p, data);
 }
 
 {
     Create(p, data);
 }
 

-bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
+bool wxWindowsPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)

 {
     m_dialogParent = p;
     m_pageDlg = NULL;
 {
     m_dialogParent = p;
     m_pageDlg = NULL;


@@ -783,7 +793,7 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
     return true;
 }
 
     return true;
 }
 

-wxPageSetupDialog::~wxPageSetupDialog()
+wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog()

 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg;
     if ( pd && pd->hDevMode )
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg;
     if ( pd && pd->hDevMode )


@@ -794,10 +804,10 @@ wxPageSetupDialog::~wxPageSetupDialog()
         delete pd;
 }
 
         delete pd;
 }
 

-int wxPageSetupDialog::ShowModal()
+int wxWindowsPageSetupDialog::ShowModal()

 {
     ConvertToNative( m_pageSetupData );
 {
     ConvertToNative( m_pageSetupData );

-    
+

     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();


@@ -816,7 +826,7 @@ int wxPageSetupDialog::ShowModal()
         return wxID_CANCEL;
 }
 
         return wxID_CANCEL;
 }
 

-bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
+bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )

 {
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 {
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();


@@ -827,7 +837,7 @@ bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-        
+

     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;
     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;


@@ -920,7 +930,7 @@ bool wxPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     return true;
 }
 
     return true;
 }
 

-bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
+bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )

 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if ( !pd )
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if ( !pd )


@@ -928,7 +938,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-        
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -940,7 +950,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }

-    
+

     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 
     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 


@@ -976,7 +986,7 @@ bool wxPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );

-    
+

     return true;
 }
 
     return true;
 }