Made .dsp files consistent with debug option; added JPEG project file

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 96a461eaaf127b255045b6d5ed9f51fecafc886e..0ec356c405da14b10e22cc1020e66c4097a1ae6c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -23,13 +23,14 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

-#include "wx/dcprint.h"
+#include "wx/string.h"

 #include "wx/log.h"
 #include "wx/log.h"

+#include "wx/window.h"
+#include "wx/msw/private.h"
+#include "wx/dcprint.h"

 #include "math.h"
 
 #include "math.h"
 

-#include <windows.h>
-
-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS || defined(__WXWINE__)

 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #endif
 


@@ -37,18 +38,6 @@
 #include <print.h>
 #endif
 
 #include <print.h>
 #endif
 

-#ifdef DrawText
-#undef DrawText
-#endif
-
-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
-
-#ifdef StartDoc
-#undef StartDoc
-#endif
-

 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #endif
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 #endif


@@ -58,7 +47,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
 {
     m_isInteractive = interactive;
     
 {
     m_isInteractive = interactive;
     

-    if (!file.IsNull() && file != "")
+    if (!file.IsNull() && file != T(""))

         m_printData.SetFilename(file);
     
 #if wxUSE_COMMON_DIALOGS
         m_printData.SetFilename(file);
     
 #if wxUSE_COMMON_DIALOGS


@@ -93,11 +82,11 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
     }
     else
 #endif
     }
     else
 #endif

-        if ((!driver_name.IsNull() && driver_name != "") &&
-            (!device_name.IsNull() && device_name != "") &&
-            (!file.IsNull() && file != ""))
+        if ((!driver_name.IsNull() && driver_name != T("")) &&
+            (!device_name.IsNull() && device_name != T("")) &&
+            (!file.IsNull() && file != T("")))

         {
         {

-            m_hDC = (WXHDC) CreateDC((char *) (const char *) driver_name, (char *) (const char *) device_name, (char *) (const char *) file, NULL);
+            m_hDC = (WXHDC) CreateDC(WXSTRINGCAST driver_name, WXSTRINGCAST device_name, WXSTRINGCAST file, NULL);

             m_ok = m_hDC ? TRUE: FALSE;
         }
         else
             m_ok = m_hDC ? TRUE: FALSE;
         }
         else


@@ -159,14 +148,14 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);
 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);

-    docinfo.lpszDocName = (const char *)message;
+    docinfo.lpszDocName = (const wxChar*)message;

 
     wxString filename(m_printData.GetFilename());
 
     if (filename.IsEmpty())
         docinfo.lpszOutput = NULL;
     else
 
     wxString filename(m_printData.GetFilename());
 
     if (filename.IsEmpty())
         docinfo.lpszOutput = NULL;
     else

-        docinfo.lpszOutput = (const char *) filename;
+        docinfo.lpszOutput = (const wxChar *) filename;

 
 #if defined(__WIN95__)
     docinfo.lpszDatatype = NULL;
 
 #if defined(__WIN95__)
     docinfo.lpszDatatype = NULL;


@@ -195,7 +184,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();
     if (ret <= 0)
     {
         DWORD lastError = GetLastError();

-        wxLogDebug("wxDC::StartDoc failed with error: %d\n", lastError);
+        wxLogDebug(T("wxDC::StartDoc failed with error: %d\n"), lastError);

     }
 #endif
     
     }
 #endif
     


@@ -273,7 +262,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != "" );
+    return ( deviceName != T("") );

 }
 
 #if 0
 }
 
 #if 0


@@ -359,33 +348,33 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     wxPrintData printData = printDataConst;
     printData.ConvertToNative();
     
     wxPrintData printData = printDataConst;
     printData.ConvertToNative();
     

-    char* driverName = (char*) NULL;
+    wxChar* driverName = (wxChar*) NULL;

     
     wxString devNameStr = printData.GetPrinterName();
     
     wxString devNameStr = printData.GetPrinterName();

-    char* deviceName;
-    char* portName = (char*) NULL; // Obsolete in WIN32
+    wxChar* deviceName;
+    wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32

     
     

-    if (devNameStr == "")
-        deviceName = (char*) NULL;
+    if (devNameStr == T(""))
+        deviceName = (wxChar*) NULL;

     else
     else

-        deviceName = (char*) (const char*) devNameStr;
+        deviceName = WXSTRINGCAST devNameStr;

 
     LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
 
 
     LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
 

-    HGLOBAL hDevMode = (HGLOBAL) printData.GetNativeData();
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) printData.GetNativeData();

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

-    if (devNameStr == "")
+    if (devNameStr == T(""))

     {
         // Retrieve the default device name
         wxString portName;
         bool ret = wxGetDefaultDeviceName(devNameStr, portName);
 
     {
         // Retrieve the default device name
         wxString portName;
         bool ret = wxGetDefaultDeviceName(devNameStr, portName);
 

-        wxASSERT_MSG( ret, "Could not get default device name." );
+        wxASSERT_MSG( ret, T("Could not get default device name.") );

 
 

-        deviceName = (char*) (const char*) devNameStr;
+        deviceName = WXSTRINGCAST devNameStr;

     }
     
 #ifdef __WIN32__
     }
     
 #ifdef __WIN32__