[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 5c90a1f9e5c5105838de40833ffb7b117f5cef1f..81687b72fe4d139b96567e3abce4c45e73d17b04 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dcprint.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,25 +24,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#if wxUSE_PRINTING_ARCHITECTURE
-

 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB

-#include "wx/msw/dib.h"
+    #include "wx/msw/dib.h"

 #endif
 
 #endif
 

-#include "wx/dcprint.h"

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

-#include "wx/math.h"

 
 #include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__
 
 #include "wx/msw/wrapcdlg.h"
 #ifndef __WIN32__


@@ -184,10 +181,8 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 

-#if defined(__WIN95__)

     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;
     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;

-#endif

 
     if (!m_hDC)
         return false;
 
     if (!m_hDC)
         return false;


@@ -401,7 +396,7 @@ void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
     if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
             !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )
     {
     if ( !(::GetDeviceCaps(GetHdc(), RASTERCAPS) & RC_STRETCHDIB) ||
             !DrawBitmapUsingStretchDIBits(GetHdc(), bmp, x, y) )
     {

-        // no support for StretchDIBits() or an error occured if we got here
+        // no support for StretchDIBits() or an error occurred if we got here

         wxMemoryDC memDC;
         memDC.SelectObject(bmp);
 
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);