1. more (minor) wxCaret bug fixes

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

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index dd2a5488130dbbb84c9941629446ff0df56dc6d2..95fe393b286191d592ae3785e9cb4dc85d681d5c 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation

 #pragma implementation "dcprint.h"
 #endif
 
 #pragma implementation "dcprint.h"
 #endif
 


@@ -25,9 +24,10 @@
 #endif
 
 #include "wx/dcprint.h"
 #endif
 
 #include "wx/dcprint.h"

+#include "wx/log.h"

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

-#include <windows.h>
+#include "wx/msw/private.h"

 
 #if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>
 
 #if wxUSE_COMMON_DIALOGS
 #include <commdlg.h>


@@ -37,104 +37,236 @@
 #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
 

+// This form is deprecated

 wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
 {
 wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
 {

-  m_isInteractive = interactive;
-
-  if (!file.IsNull() && file != "")
-    m_filename = file;
-
+    m_isInteractive = interactive;
+    
+    if (!file.IsNull() && file != "")
+        m_printData.SetFilename(file);
+    

 #if wxUSE_COMMON_DIALOGS
 #if wxUSE_COMMON_DIALOGS

-   if (interactive)
-   {
-     PRINTDLG pd;
-       
-     pd.lStructSize = sizeof( PRINTDLG );
-     pd.hwndOwner=NULL;
-     pd.hDevMode=(HANDLE)NULL;
-     pd.hDevNames=(HANDLE)NULL;
-     pd.Flags=PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
-     pd.nFromPage=0;
-     pd.nToPage=0;
-     pd.nMinPage=0;
-     pd.nMaxPage=0;
-     pd.nCopies=1;
-     pd.hInstance=(HINSTANCE)NULL;
-
-     if ( PrintDlg( &pd ) != 0 )
-     {
-       m_hDC = (WXHDC) pd.hDC;
-       m_ok = TRUE;
-     }
-     else
-     {
-       m_ok = FALSE;
-       return;
-     }
-
-//     m_dontDelete = TRUE;
-   }
-   else
-#endif
-   if ((!driver_name.IsNull() && driver_name != "") &&
-       (!device_name.IsNull() && device_name != "") &&
-       (!file.IsNull() && file != ""))
-   {
-     m_hDC = (WXHDC) CreateDC((char *) (const char *) driver_name, (char *) (const char *) device_name, (char *) (const char *) file, NULL);
-     m_ok = m_hDC ? TRUE: FALSE;
-   }
-   else
-   {
-     m_hDC = wxGetPrinterDC(orientation);
-     m_ok = m_hDC ? TRUE: FALSE;
-   }
-   
-   if (m_hDC)
-   {
-//     int width = GetDeviceCaps(m_hDC, VERTRES);
-//     int height = GetDeviceCaps(m_hDC, HORZRES);
-     SetMapMode(MM_TEXT);
-   }
-  SetBrush(*wxBLACK_BRUSH);
-  SetPen(*wxBLACK_PEN);
+    if (interactive)
+    {
+        PRINTDLG pd;
+        
+        pd.lStructSize = sizeof( PRINTDLG );
+        pd.hwndOwner=(HWND) NULL;
+        pd.hDevMode=(HANDLE)NULL;
+        pd.hDevNames=(HANDLE)NULL;
+        pd.Flags=PD_RETURNDC | PD_NOSELECTION | PD_NOPAGENUMS;
+        pd.nFromPage=0;
+        pd.nToPage=0;
+        pd.nMinPage=0;
+        pd.nMaxPage=0;
+        pd.nCopies=1;
+        pd.hInstance=(HINSTANCE)NULL;
+        
+        if ( PrintDlg( &pd ) != 0 )
+        {
+            m_hDC = (WXHDC) pd.hDC;
+            m_ok = TRUE;
+        }
+        else
+        {
+            m_ok = FALSE;
+            return;
+        }
+        
+        //     m_dontDelete = TRUE;
+    }
+    else
+#endif
+        if ((!driver_name.IsNull() && driver_name != "") &&
+            (!device_name.IsNull() && device_name != "") &&
+            (!file.IsNull() && file != ""))
+        {
+            m_hDC = (WXHDC) CreateDC((char *) (const char *) driver_name, (char *) (const char *) device_name, (char *) (const char *) file, NULL);
+            m_ok = m_hDC ? TRUE: FALSE;
+        }
+        else
+        {
+            wxPrintData printData;
+            printData.SetOrientation(orientation);
+            m_hDC = wxGetPrinterDC(printData);
+            m_ok = m_hDC ? TRUE: FALSE;
+        }
+        
+        if (m_hDC)
+        {
+            //     int width = GetDeviceCaps(m_hDC, VERTRES);
+            //     int height = GetDeviceCaps(m_hDC, HORZRES);
+            SetMapMode(wxMM_TEXT);
+        }
+        SetBrush(*wxBLACK_BRUSH);
+        SetPen(*wxBLACK_PEN);

 }
 
 }
 

+wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
+{
+    m_printData = printData;
+
+    m_isInteractive = FALSE;
+
+    m_hDC = wxGetPrinterDC(printData);
+    m_ok = (m_hDC != 0);
+    
+    if (m_hDC)
+        SetMapMode(wxMM_TEXT);
+    
+    SetBrush(*wxBLACK_BRUSH);
+    SetPen(*wxBLACK_PEN);
+}
+
+

 wxPrinterDC::wxPrinterDC(WXHDC theDC)
 {
 wxPrinterDC::wxPrinterDC(WXHDC theDC)
 {

-  m_isInteractive = FALSE;
-
-  m_hDC = theDC;
-  m_ok = TRUE;
-  if (m_hDC)
- {
-//     int width = GetDeviceCaps(m_hDC, VERTRES);
-//     int height = GetDeviceCaps(m_hDC, HORZRES);
-    SetMapMode(MM_TEXT);
-  }
-  SetBrush(*wxBLACK_BRUSH);
-  SetPen(*wxBLACK_PEN);
+    m_isInteractive = FALSE;
+    
+    m_hDC = theDC;
+    m_ok = TRUE;
+    if (m_hDC)
+    {
+        //     int width = GetDeviceCaps(m_hDC, VERTRES);
+        //     int height = GetDeviceCaps(m_hDC, HORZRES);
+        SetMapMode(wxMM_TEXT);
+    }
+    SetBrush(*wxBLACK_BRUSH);
+    SetPen(*wxBLACK_PEN);

 }
 
 wxPrinterDC::~wxPrinterDC(void)
 {
 }
 
 }
 
 wxPrinterDC::~wxPrinterDC(void)
 {
 }
 

+bool wxPrinterDC::StartDoc(const wxString& message)
+{
+    DOCINFO docinfo;
+    docinfo.cbSize = sizeof(DOCINFO);
+    docinfo.lpszDocName = (const char *)message;
+
+    wxString filename(m_printData.GetFilename());
+
+    if (filename.IsEmpty())
+        docinfo.lpszOutput = NULL;
+    else
+        docinfo.lpszOutput = (const char *) filename;
+
+#if defined(__WIN95__)
+    docinfo.lpszDatatype = NULL;
+    docinfo.fwType = 0;
+#endif
+    
+    if (!m_hDC)
+        return FALSE;
+    
+    int ret =
+#ifndef __WIN32__
+        ::StartDoc((HDC) m_hDC, &docinfo);
+#else
+#ifdef UNICODE
+    ::StartDocW((HDC) m_hDC, &docinfo);
+#else
+#ifdef __TWIN32__
+    ::StartDoc((HDC) m_hDC, &docinfo);
+#else
+    ::StartDocA((HDC) m_hDC, &docinfo);
+#endif
+#endif
+#endif
+    
+#ifndef __WIN16__
+    if (ret <= 0)
+    {
+        DWORD lastError = GetLastError();
+        wxLogDebug("wxDC::StartDoc failed with error: %d\n", lastError);
+    }
+#endif
+    
+    return (ret > 0);
+}
+
+void wxPrinterDC::EndDoc(void)
+{
+    if (m_hDC) ::EndDoc((HDC) m_hDC);
+}
+
+void wxPrinterDC::StartPage(void)
+{
+    if (m_hDC)
+        ::StartPage((HDC) m_hDC);
+}
+
+void wxPrinterDC::EndPage(void)
+{
+    if (m_hDC)
+        ::EndPage((HDC) m_hDC);
+}
+
+// Returns default device and port names
+static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
+{
+    deviceName = "";
+
+    LPDEVNAMES  lpDevNames;
+    LPSTR       lpszDriverName;
+    LPSTR       lpszDeviceName;
+    LPSTR       lpszPortName;
+    
+    PRINTDLG    pd;
+
+    // Cygwin has trouble believing PRINTDLG is 66 bytes - thinks it is 68
+#ifdef __GNUWIN32__
+    pd.lStructSize    = 66; // sizeof(PRINTDLG);
+#else
+    pd.lStructSize    = sizeof(PRINTDLG);
+#endif
+
+    pd.hwndOwner      = (HWND)NULL;
+    pd.hDevMode       = NULL; // Will be created by PrintDlg
+    pd.hDevNames      = NULL; // Ditto
+    pd.Flags          = PD_RETURNDEFAULT;
+    pd.nCopies        = 1;
+    
+    if (!PrintDlg((LPPRINTDLG)&pd))
+    {
+        if ( pd.hDevMode )
+            GlobalFree(pd.hDevMode);
+        if (pd.hDevNames)
+            GlobalFree(pd.hDevNames);
+        
+        return FALSE;
+    }
+    
+    if (pd.hDevNames)
+    {
+        lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
+        lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
+        lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
+        lpszPortName   = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
+        GlobalUnlock(pd.hDevNames);
+        GlobalFree(pd.hDevNames);
+        pd.hDevNames=NULL;
+
+        deviceName = lpszDeviceName;
+        portName = lpszPortName;
+    }
+    
+    if (pd.hDevMode)
+    {
+        GlobalFree(pd.hDevMode);
+        pd.hDevMode=NULL;
+    }
+    return ( deviceName != "" );
+}
+
+#if 0
+// This uses defaults, except for orientation, so we should eliminate this function
+// and use the 2nd form (passing wxPrintData) instead.

 WXHDC wxGetPrinterDC(int orientation)
 {
     HDC         hDC;
 WXHDC wxGetPrinterDC(int orientation)
 {
     HDC         hDC;


@@ -143,58 +275,62 @@ WXHDC wxGetPrinterDC(int orientation)
     LPSTR       lpszDriverName;
     LPSTR       lpszDeviceName;
     LPSTR       lpszPortName;
     LPSTR       lpszDriverName;
     LPSTR       lpszDeviceName;
     LPSTR       lpszPortName;

-
+    

     PRINTDLG    pd;
     // __GNUWIN32__ has trouble believing PRINTDLG is 66 bytes - thinks it is 68
     PRINTDLG    pd;
     // __GNUWIN32__ has trouble believing PRINTDLG is 66 bytes - thinks it is 68

+#ifdef __GNUWIN32__

     pd.lStructSize    = 66; // sizeof(PRINTDLG);
     pd.lStructSize    = 66; // sizeof(PRINTDLG);

+#else
+    pd.lStructSize    = sizeof(PRINTDLG);
+#endif

     pd.hwndOwner      = (HWND)NULL;
     pd.hDevMode       = NULL; // Will be created by PrintDlg
     pd.hDevNames      = NULL; // Ditto
     pd.Flags          = PD_RETURNDEFAULT;
     pd.nCopies        = 1;
     pd.hwndOwner      = (HWND)NULL;
     pd.hDevMode       = NULL; // Will be created by PrintDlg
     pd.hDevNames      = NULL; // Ditto
     pd.Flags          = PD_RETURNDEFAULT;
     pd.nCopies        = 1;

-
+    

     if (!PrintDlg((LPPRINTDLG)&pd))
     {
         if ( pd.hDevMode )
             GlobalFree(pd.hDevMode);
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
     if (!PrintDlg((LPPRINTDLG)&pd))
     {
         if ( pd.hDevMode )
             GlobalFree(pd.hDevMode);
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);

-
+        

         return(0);
     }
         return(0);
     }

-
+    

     if (!pd.hDevNames)
     {
         if ( pd.hDevMode )
             GlobalFree(pd.hDevMode);
     }
     if (!pd.hDevNames)
     {
         if ( pd.hDevMode )
             GlobalFree(pd.hDevMode);
     }

-
+    

     lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
     lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
     lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
     lpszPortName   = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
     GlobalUnlock(pd.hDevNames);
     lpDevNames = (LPDEVNAMES)GlobalLock(pd.hDevNames);
     lpszDriverName = (LPSTR)lpDevNames + lpDevNames->wDriverOffset;
     lpszDeviceName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
     lpszPortName   = (LPSTR)lpDevNames + lpDevNames->wOutputOffset;
     GlobalUnlock(pd.hDevNames);

-
+    

     if ( pd.hDevMode )
     {
         lpDevMode = (DEVMODE*) GlobalLock(pd.hDevMode);
         lpDevMode->dmOrientation = orientation;
         lpDevMode->dmFields |= DM_ORIENTATION;
     }
     if ( pd.hDevMode )
     {
         lpDevMode = (DEVMODE*) GlobalLock(pd.hDevMode);
         lpDevMode->dmOrientation = orientation;
         lpDevMode->dmFields |= DM_ORIENTATION;
     }

-
+    

 #ifdef __WIN32__
     hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (DEVMODE *)lpDevMode);
 #else
     hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (LPSTR)lpDevMode);
 #endif
 #ifdef __WIN32__
     hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (DEVMODE *)lpDevMode);
 #else
     hDC = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, (LPSTR)lpDevMode);
 #endif

-
+    

     if (pd.hDevMode && lpDevMode)
         GlobalUnlock(pd.hDevMode);
     if (pd.hDevMode && lpDevMode)
         GlobalUnlock(pd.hDevMode);

-
+    

     if (pd.hDevNames)
     {
     if (pd.hDevNames)
     {

-           GlobalFree(pd.hDevNames);
-           pd.hDevNames=NULL;
+        GlobalFree(pd.hDevNames);
+        pd.hDevNames=NULL;

     }
     if (pd.hDevMode)
     {
     }
     if (pd.hDevMode)
     {


@@ -203,5 +339,52 @@ WXHDC wxGetPrinterDC(int orientation)
     }
     return (WXHDC) hDC;
 }
     }
     return (WXHDC) hDC;
 }

+#endif
+
+// Gets an HDC for the specified printer configuration
+WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
+{
+    wxPrintData printData = printDataConst;
+    printData.ConvertToNative();
+    
+    char* driverName = (char*) NULL;
+    
+    wxString devNameStr = printData.GetPrinterName();
+    char* deviceName;
+    char* portName = (char*) NULL; // Obsolete in WIN32
+    
+    if (devNameStr == "")
+        deviceName = (char*) NULL;
+    else
+        deviceName = (char*) (const char*) devNameStr;
+
+    LPDEVMODE lpDevMode = (LPDEVMODE) NULL;
+
+    HGLOBAL hDevMode = (HGLOBAL) printData.GetNativeData();
+
+    if ( hDevMode )
+        lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
+
+    if (devNameStr == "")
+    {
+        // Retrieve the default device name
+        wxString portName;
+        bool ret = wxGetDefaultDeviceName(devNameStr, portName);
+
+        wxASSERT_MSG( ret, "Could not get default device name." );

 
 

+        deviceName = (char*) (const char*) devNameStr;
+    }
+    
+#ifdef __WIN32__
+    HDC hDC = CreateDC(driverName, deviceName, portName, (DEVMODE *) lpDevMode);
+#else
+    HDC hDC = CreateDC(driverName, deviceName, portName, (LPSTR) lpDevMode);
+#endif
+    
+    if (hDevMode && lpDevMode)
+        GlobalUnlock(hDevMode);
+    
+    return (WXHDC) hDC;
+}