WS_CLIPCHILDREN is not always enabled in wxNotebook (caused painting problems).

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 35c568f7a5a96d7ece34287aa1d07fef8b35f772..23593c665aa3e2e6dd36dd02fe2b46cd823a8cbb 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation
 #pragma implementation "dcprint.h"
 #endif
 
@@ -26,11 +25,10 @@
 
 #include "wx/dcprint.h"
 #include "math.h"
-#include "fstream.h"
 
 #include <windows.h>
 
-#if USE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>
 #endif
 
@@ -61,13 +59,13 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
   if (!file.IsNull() && file != "")
     m_filename = file;
 
-#if USE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS
    if (interactive)
    {
      PRINTDLG pd;
        
      pd.lStructSize = sizeof( PRINTDLG );
-     pd.hwndOwner=NULL;
+     pd.hwndOwner=(HWND) NULL;
      pd.hDevMode=(HANDLE)NULL;
      pd.hDevNames=(HANDLE)NULL;
      pd.Flags=PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
@@ -110,7 +108,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
    {
 //     int width = GetDeviceCaps(m_hDC, VERTRES);
 //     int height = GetDeviceCaps(m_hDC, HORZRES);
-     SetMapMode(MM_TEXT);
+     SetMapMode(wxMM_TEXT);
    }
   SetBrush(*wxBLACK_BRUSH);
   SetPen(*wxBLACK_PEN);
@@ -126,7 +124,7 @@ wxPrinterDC::wxPrinterDC(WXHDC theDC)
  {
 //     int width = GetDeviceCaps(m_hDC, VERTRES);
 //     int height = GetDeviceCaps(m_hDC, HORZRES);
-    SetMapMode(MM_TEXT);
+    SetMapMode(wxMM_TEXT);
   }
   SetBrush(*wxBLACK_BRUSH);
   SetPen(*wxBLACK_PEN);