gtk_signal_connect -> g_signal_connect in unix/mediactrl.cpp

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index e817ba19894c2c0a1931be86b1d249a3540d9333..3fbe8b2085182bf36ec4e89a808eba7f32fc8672 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"
 


@@ -45,12 +41,10 @@
 
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"

-#include "math.h"
-
-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
-#endif
+#include "wx/msw/printdlg.h"
+#include "wx/math.h"

 
 

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

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


@@ -181,15 +175,13 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 
     wxString filename(m_printData.GetFilename());
 
 
     wxString filename(m_printData.GetFilename());
 

-    if (filename.IsEmpty())
+    if (filename.empty())

         docinfo.lpszOutput = NULL;
     else
         docinfo.lpszOutput = (const wxChar *) filename;
 
         docinfo.lpszOutput = NULL;
     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;


@@ -277,16 +269,28 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != wxEmptyString );
+    return ( !deviceName.empty() );

 }
 
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {
 }
 
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {

+#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#if 0
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) printDataConst.GetNativeData();
+    // FIXME: how further ???
+#else
+    return 0;
+#endif
+
+#else // Postscript vs. native Windows
+

     wxWindowsPrintNativeData *data =
         (wxWindowsPrintNativeData *) printDataConst.GetNativeData();
     wxWindowsPrintNativeData *data =
         (wxWindowsPrintNativeData *) printDataConst.GetNativeData();

-        
-    data->ConvertFrom( printDataConst );
+
+    data->TransferFrom( printDataConst );

 
     wxChar* driverName = (wxChar*) NULL;
 
 
     wxChar* driverName = (wxChar*) NULL;
 


@@ -301,7 +305,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 
     LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
 
 
     LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
 

-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetNativeData();
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();

 
     if ( hDevMode )
         lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
 
     if ( hDevMode )
         lpDevMode = (DEVMODE*) GlobalLock(hDevMode);


@@ -327,6 +331,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
         GlobalUnlock(hDevMode);
 
     return (WXHDC) hDC;
         GlobalUnlock(hDevMode);
 
     return (WXHDC) hDC;

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -390,7 +395,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);