fixing dangling includes

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

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 9d96491f6742461db63e620f1dd9322f1ce87e81..c7bc5edb3e4013b5b397c4b53703d204ca4241f9 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -42,10 +42,6 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

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

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


@@ -83,9 +79,12 @@ static wxString wxGetPrintDlgError()
     }
     return msg;
 }
     }
     return msg;
 }

-#endif
+#endif // __WXDEBUG__

 
 

-static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+static HGLOBAL
+wxCreateDevNames(const wxString& driverName,
+                 const wxString& printerName,
+                 const wxString& portName)

 {
     HGLOBAL hDev = NULL;
     // if (!driverName.empty() && !printerName.empty() && !portName.empty())
 {
     HGLOBAL hDev = NULL;
     // if (!driverName.empty() && !printerName.empty() && !portName.empty())


@@ -130,10 +129,10 @@ wxWindowsPrintNativeData::wxWindowsPrintNativeData()
 wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
 {
     if ( m_devMode )
 wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
 {
     if ( m_devMode )

-        ::GlobalFree(wx_static_cast(HGLOBAL, m_devMode));
+        ::GlobalFree(static_cast<HGLOBAL>(m_devMode));

 
     if ( m_devNames )
 
     if ( m_devNames )

-        ::GlobalFree(wx_static_cast(HGLOBAL, m_devNames));
+        ::GlobalFree(static_cast<HGLOBAL>(m_devNames));

 }
 
 bool wxWindowsPrintNativeData::IsOk() const
 }
 
 bool wxWindowsPrintNativeData::IsOk() const


@@ -148,7 +147,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 
     GlobalPtrLock lockDevMode(m_devMode);
 
 
     GlobalPtrLock lockDevMode(m_devMode);
 

-    LPDEVMODE devMode = wx_static_cast(LPDEVMODE, lockDevMode.Get());
+    LPDEVMODE devMode = static_cast<LPDEVMODE>(lockDevMode.Get());

 
     //// Orientation
     if (devMode->dmFields & DM_ORIENTATION)
 
     //// Orientation
     if (devMode->dmFields & DM_ORIENTATION)


@@ -184,12 +183,10 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             case DMBIN_CASSETTE       : data.SetBin(wxPRINTBIN_CASSETTE      ); break;
             case DMBIN_FORMSOURCE     : data.SetBin(wxPRINTBIN_FORMSOURCE    ); break;
             default:
             case DMBIN_CASSETTE       : data.SetBin(wxPRINTBIN_CASSETTE      ); break;
             case DMBIN_FORMSOURCE     : data.SetBin(wxPRINTBIN_FORMSOURCE    ); break;
             default:

-                if (devMode->dmDefaultSource>=DMBIN_USER) {
+                if (devMode->dmDefaultSource >= DMBIN_USER)

                     data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
                     data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));

-                } else {
+                else

                     data.SetBin(wxPRINTBIN_DEFAULT);
                     data.SetBin(wxPRINTBIN_DEFAULT);

-                }
-                break;

         }
     } else {
         data.SetBin(wxPRINTBIN_DEFAULT);
         }
     } else {
         data.SetBin(wxPRINTBIN_DEFAULT);


@@ -315,7 +312,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
     if ( m_devNames )
     {
         GlobalPtrLock lockDevNames(m_devNames);
     if ( m_devNames )
     {
         GlobalPtrLock lockDevNames(m_devNames);

-        LPDEVNAMES lpDevNames = wx_static_cast(LPDEVNAMES, lockDevNames.Get());
+        LPDEVNAMES lpDevNames = static_cast<LPDEVNAMES>(lockDevNames.Get());

 
         // TODO: Unicode-ification
 
 
         // TODO: Unicode-ification
 


@@ -338,29 +335,22 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 
 bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 {
 
 bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 {

-    HGLOBAL hDevMode = wx_static_cast(HGLOBAL, m_devMode);
+    HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);

     if ( !m_devMode )
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
         PRINTDLG pd;
 
     if ( !m_devMode )
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
         PRINTDLG pd;
 

-        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
-        memset(&pd, 0, 66);
-        pd.lStructSize    = 66;
-#else

         memset(&pd, 0, sizeof(PRINTDLG));
 #ifdef __WXWINCE__
         pd.cbStruct    = sizeof(PRINTDLG);
 #else
         pd.lStructSize    = sizeof(PRINTDLG);
         memset(&pd, 0, sizeof(PRINTDLG));
 #ifdef __WXWINCE__
         pd.cbStruct    = sizeof(PRINTDLG);
 #else
         pd.lStructSize    = sizeof(PRINTDLG);

-#endif

 #endif
 
 #endif
 

-        pd.hwndOwner      = (HWND)NULL;
+        pd.hwndOwner      = NULL;

         pd.hDevMode       = NULL; // Will be created by PrintDlg
         pd.hDevNames      = NULL; // Ditto
         pd.hDevMode       = NULL; // Will be created by PrintDlg
         pd.hDevNames      = NULL; // Ditto

-        //pd.hInstance      = (HINSTANCE) wxGetInstance();

 
         pd.Flags          = PD_RETURNDEFAULT;
         pd.nCopies        = 1;
 
         pd.Flags          = PD_RETURNDEFAULT;
         pd.nCopies        = 1;


@@ -376,11 +366,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
             pd.hDevMode = NULL;
             pd.hDevNames = NULL;
 
             pd.hDevMode = NULL;
             pd.hDevNames = NULL;
 

-#if defined(__WXDEBUG__) && defined(__WIN32__)
+#ifdef __WXDEBUG__

             wxString str(wxT("Printing error: "));
             str += wxGetPrintDlgError();
             wxLogDebug(str);
             wxString str(wxT("Printing error: "));
             str += wxGetPrintDlgError();
             wxLogDebug(str);

-#endif
+#endif // __WXDEBUG__

         }
         else
         {
         }
         else
         {


@@ -403,7 +393,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
     if ( hDevMode )
     {
         GlobalPtrLock lockDevMode(hDevMode);
     if ( hDevMode )
     {
         GlobalPtrLock lockDevMode(hDevMode);

-        DEVMODE * const devMode = wx_static_cast(DEVMODE *, lockDevMode.Get());
+        DEVMODE * const devMode = static_cast<DEVMODE *>(lockDevMode.Get());

 
         //// Orientation
         devMode->dmOrientation = (short)data.GetOrientation();
 
         //// Orientation
         devMode->dmOrientation = (short)data.GetOrientation();


@@ -420,9 +410,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         wxString name = data.GetPrinterName();
         if (!name.empty())
         {
         wxString name = data.GetPrinterName();
         if (!name.empty())
         {

-            wxStrncpy(devMode->dmDeviceName, name.wx_str(),
-                      WXSIZEOF(devMode->dmDeviceName) - 1);
-            devMode->dmDeviceName[WXSIZEOF(devMode->dmDeviceName) - 1] = wxT('\0');
+            // 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(),
+                      WXSIZEOF(devMode->dmDeviceName));

         }
 
         //// Colour
         }
 
         //// Colour


@@ -551,7 +543,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 
     if ( m_devNames )
     {
 
     if ( m_devNames )
     {

-        ::GlobalFree(wx_static_cast(HGLOBAL, m_devNames));
+        ::GlobalFree(static_cast<HGLOBAL>(m_devNames));

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


@@ -645,7 +637,7 @@ wxDC *wxWindowsPrintDialog::GetPrintDC()
         return m_printerDC;
     }
     else
         return m_printerDC;
     }
     else

-        return (wxPrinterDC*) NULL;
+        return NULL;

 }
 
 bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
 }
 
 bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )


@@ -664,13 +656,8 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
 
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
 

-    // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
-    pd->lStructSize    = 66;
-#else

     pd->lStructSize    = sizeof(PRINTDLG);
     pd->lStructSize    = sizeof(PRINTDLG);

-#endif
-    pd->hwndOwner      = (HWND)NULL;
+    pd->hwndOwner      = NULL;

     pd->hDevMode       = NULL; // Will be created by PrintDlg
     pd->hDevNames      = NULL; // Ditto
 
     pd->hDevMode       = NULL; // Will be created by PrintDlg
     pd->hDevNames      = NULL; // Ditto
 


@@ -687,17 +674,17 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     if (pd->hDevNames)
         GlobalFree(pd->hDevNames);
 
     if (pd->hDevNames)
         GlobalFree(pd->hDevNames);
 

-    pd->hDevMode = wx_static_cast(HGLOBAL, native_data->GetDevMode());
+    pd->hDevMode = static_cast<HGLOBAL>(native_data->GetDevMode());

     native_data->SetDevMode(NULL);
 
     // Shouldn't assert; we should be able to test Ok-ness at a higher level
     //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
 
     native_data->SetDevMode(NULL);
 
     // Shouldn't assert; we should be able to test Ok-ness at a higher level
     //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
 

-    pd->hDevNames = wx_static_cast(HGLOBAL, native_data->GetDevNames());
+    pd->hDevNames = static_cast<HGLOBAL>(native_data->GetDevNames());

     native_data->SetDevNames(NULL);
 
 
     native_data->SetDevNames(NULL);
 
 

-    pd->hDC = (HDC) NULL;
+    pd->hDC = NULL;

     pd->nFromPage = (WORD)data.GetFromPage();
     pd->nToPage = (WORD)data.GetToPage();
     pd->nMinPage = (WORD)data.GetMinPage();
     pd->nFromPage = (WORD)data.GetFromPage();
     pd->nToPage = (WORD)data.GetToPage();
     pd->nMinPage = (WORD)data.GetMinPage();


@@ -705,23 +692,17 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     pd->nCopies = (WORD)data.GetNoCopies();
 
     pd->Flags = PD_RETURNDC;
     pd->nCopies = (WORD)data.GetNoCopies();
 
     pd->Flags = PD_RETURNDC;

-
-#ifdef __GNUWIN32__
-    pd->lStructSize = 66;
-#else

     pd->lStructSize = sizeof( PRINTDLG );
     pd->lStructSize = sizeof( PRINTDLG );

-#endif

 
 

-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HANDLE)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-    pd->lCustData = (LPARAM) NULL;
+    pd->hwndOwner = NULL;
+    pd->hInstance = NULL;
+    pd->lCustData = 0;

     pd->lpfnPrintHook = NULL;
     pd->lpfnSetupHook = NULL;
     pd->lpPrintTemplateName = NULL;
     pd->lpSetupTemplateName = NULL;
     pd->lpfnPrintHook = NULL;
     pd->lpfnSetupHook = NULL;
     pd->lpPrintTemplateName = NULL;
     pd->lpSetupTemplateName = NULL;

-    pd->hPrintTemplate = (HGLOBAL) NULL;
-    pd->hSetupTemplate = (HGLOBAL) NULL;
+    pd->hPrintTemplate = NULL;
+    pd->hSetupTemplate = NULL;

 
     if ( data.GetAllPages() )
         pd->Flags |= PD_ALLPAGES;
 
     if ( data.GetAllPages() )
         pd->Flags |= PD_ALLPAGES;


@@ -759,7 +740,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     {
         if (native_data->GetDevMode())
         {
     {
         if (native_data->GetDevMode())
         {

-            ::GlobalFree(wx_static_cast(HGLOBAL, native_data->GetDevMode()));
+            ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevMode()));

         }
         native_data->SetDevMode(pd->hDevMode);
         pd->hDevMode = NULL;
         }
         native_data->SetDevMode(pd->hDevMode);
         pd->hDevMode = NULL;


@@ -770,7 +751,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     {
         if (native_data->GetDevNames())
         {
     {
         if (native_data->GetDevNames())
         {

-            ::GlobalFree(wx_static_cast(HGLOBAL, native_data->GetDevNames()));
+            ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevNames()));

         }
         native_data->SetDevNames(pd->hDevNames);
         pd->hDevNames = NULL;
         }
         native_data->SetDevNames(pd->hDevNames);
         pd->hDevNames = NULL;


@@ -886,7 +867,7 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
         pd->hDevMode = NULL;
     }
     pd->hDevMode = (HGLOBAL) native_data->GetDevMode();
         pd->hDevMode = NULL;
     }
     pd->hDevMode = (HGLOBAL) native_data->GetDevMode();

-    native_data->SetDevMode( (void*) NULL );
+    native_data->SetDevMode(NULL);

 
     // Shouldn't assert; we should be able to test Ok-ness at a higher level
     //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
 
     // Shouldn't assert; we should be able to test Ok-ness at a higher level
     //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));


@@ -901,7 +882,7 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
         pd->hDevNames = NULL;
     }
     pd->hDevNames = (HGLOBAL) native_data->GetDevNames();
         pd->hDevNames = NULL;
     }
     pd->hDevNames = (HGLOBAL) native_data->GetDevNames();

-    native_data->SetDevNames((void*) NULL);
+    native_data->SetDevNames(NULL);

 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 


@@ -926,9 +907,8 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );

-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HWND)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
+    pd->hwndOwner = NULL;
+    pd->hInstance = NULL;

     //   PAGESETUPDLG is in hundreds of a mm
     pd->ptPaperSize.x = data.GetPaperSize().x * 100;
     pd->ptPaperSize.y = data.GetPaperSize().y * 100;
     //   PAGESETUPDLG is in hundreds of a mm
     pd->ptPaperSize.x = data.GetPaperSize().x * 100;
     pd->ptPaperSize.y = data.GetPaperSize().y * 100;