non-PCH build fix (according to Tinderbox).

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

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 8367bb39403fc7c6f536c2764b39d77ceab0904e..e71b9dc084f2c27935d15bc29d88fdd6980bd137 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -1,59 +1,61 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcprint.cpp
+// Name:        src/os2/dcprint.cpp

 // Purpose:     wxPrinterDC class
 // Purpose:     wxPrinterDC class

-// Author:      Julian Smart
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#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"

-#ifndef WX_PRECOMP
-#endif

 
 

-#include "wx/string.h"
-#include "wx/log.h"
-#include "wx/window.h"
-#include "wx/os2/private.h"
-#include "wx/dcprint.h"
-#include "math.h"
+#if wxUSE_PRINTING_ARCHITECTURE

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
+#include "wx/dcprint.h"

 
 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
 
 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 

+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/math.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/window.h"
+#endif
+
+#include "wx/os2/private.h"
+
+IMPLEMENT_CLASS(wxPrinterDC, wxDC)
+
+

 // This form is deprecated
 // 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& rsDriverName,
+                          const wxString& rsDeviceName,
+                          const wxString& rsFile,
+                          bool bInteractive,
+                          int nOrientation )

 {
 {

-    LONG            lType;
-    HAB             hab;
-    DEVOPENSTRUC    devOpen = { (char*)device_name.c_str()
-                               ,(char*)driver_name.c_str()
-                               ,NULL
-                               ,NULL
-                               ,NULL
-                               ,NULL
-                               ,NULL
-                               ,NULL
-                               ,NULL
-                              };
-
-    m_isInteractive = interactive;
-
-    if (!file.IsNull() && file != T(""))
-        m_printData.SetFilename(file);
+    DEVOPENSTRUC    vDevOpen = { (char*)rsDeviceName.c_str()
+                                ,(char*)rsDriverName.c_str()
+                                ,NULL
+                                ,NULL
+                                ,NULL
+                                ,NULL
+                                ,NULL
+                                ,NULL
+                                ,NULL
+                               };
+
+    m_isInteractive = bInteractive;
+
+    if (!rsFile.IsNull() && !rsFile.empty())
+        m_printData.SetFilename(rsFile);

 
 /*
     Implement PM's version of this
 
 /*
     Implement PM's version of this


@@ -77,38 +79,37 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
         if ( PrintDlg( &pd ) != 0 )
         {
             m_hDC = (WXHDC) pd.hDC;
         if ( PrintDlg( &pd ) != 0 )
         {
             m_hDC = (WXHDC) pd.hDC;

-            m_ok = TRUE;
+            m_ok = true;

         }
         else
         {
         }
         else
         {

-            m_ok = FALSE;
+            m_ok = false;

             return;
         }
             return;
         }

-
-        //     m_dontDelete = TRUE;

     }
     else
 #endif
 */
     }
     else
 #endif
 */

-        if ((!driver_name.IsNull() && driver_name != T("")) &&
-            (!device_name.IsNull() && device_name != T("")) &&
-            (!file.IsNull() && file != T("")))
+        if ( !rsDriverName.empty() &&
+             !rsDeviceName.empty() &&
+             !rsFile.empty() )

         {
         {

-            m_hDC = (WXHDC) ::DevOpenDC( hab
+            m_hDC = (WXHDC) ::DevOpenDC( vHabmain

                                         ,OD_QUEUED
                                         ,"*"
                                         ,5L
                                         ,OD_QUEUED
                                         ,"*"
                                         ,5L

-                                        ,(PDEVOPENDATA)&devOpen
+                                        ,(PDEVOPENDATA)&vDevOpen

                                         ,NULLHANDLE
                                        );
                                         ,NULLHANDLE
                                        );

-            m_ok = m_hDC ? TRUE: FALSE;
+            m_ok = m_hDC ? true: false;

         }
         else
         {
         }
         else
         {

-            wxPrintData printData;
-            printData.SetOrientation(orientation);
-            m_hDC = wxGetPrinterDC(printData);
-            m_ok = m_hDC ? TRUE: FALSE;
+            wxPrintData             vPrintData;
+
+            vPrintData.SetOrientation(nOrientation);
+            m_hDC = wxGetPrinterDC(vPrintData);
+            m_ok = m_hDC ? true: false;

         }
 
         if (m_hDC)
         }
 
         if (m_hDC)


@@ -119,46 +120,45 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_nam
         }
         SetBrush(*wxBLACK_BRUSH);
         SetPen(*wxBLACK_PEN);
         }
         SetBrush(*wxBLACK_BRUSH);
         SetPen(*wxBLACK_PEN);

-}
+} // end of wxPrinterDC::wxPrinterDC

 
 

-wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
+wxPrinterDC::wxPrinterDC( const wxPrintData& rPrintData )

 {
 {

-    m_printData = printData;
-
-    m_isInteractive = FALSE;
-
-    m_hDC = wxGetPrinterDC(printData);
+    m_printData = rPrintData;
+    m_isInteractive = false;
+    m_hDC = wxGetPrinterDC(rPrintData);

     m_ok = (m_hDC != 0);
     m_ok = (m_hDC != 0);

-

     if (m_hDC)
         SetMapMode(wxMM_TEXT);
     if (m_hDC)
         SetMapMode(wxMM_TEXT);

-

     SetBrush(*wxBLACK_BRUSH);
     SetPen(*wxBLACK_PEN);
     SetBrush(*wxBLACK_BRUSH);
     SetPen(*wxBLACK_PEN);

-}
+} // end of wxPrinterDC::wxPrinterDC

 
 

-
-wxPrinterDC::wxPrinterDC(WXHDC theDC)
+wxPrinterDC::wxPrinterDC( WXHDC hTheDC )

 {
 {

-    m_isInteractive = FALSE;
-
-    m_hDC = theDC;
-    m_ok = TRUE;
+    m_isInteractive = false;
+    m_hDC = hTheDC;
+    m_ok = true;

     if (m_hDC)
     {
     if (m_hDC)
     {

-        //     int width = GetDeviceCaps(m_hDC, VERTRES);
-        //     int height = GetDeviceCaps(m_hDC, HORZRES);

         SetMapMode(wxMM_TEXT);
     }
     SetBrush(*wxBLACK_BRUSH);
     SetPen(*wxBLACK_PEN);
         SetMapMode(wxMM_TEXT);
     }
     SetBrush(*wxBLACK_BRUSH);
     SetPen(*wxBLACK_PEN);

-}
+} // end of wxPrinterDC::wxPrinterDC

 
 

-wxPrinterDC::~wxPrinterDC(void)
+void wxPrinterDC::Init()

 {
 {

-}
+    if (m_hDC)
+    {
+        SetMapMode(wxMM_TEXT);

 
 

-bool wxPrinterDC::StartDoc(const wxString& message)
+        SetBrush(*wxBLACK_BRUSH);
+        SetPen(*wxBLACK_PEN);
+    }
+} // end of wxPrinterDC::Init
+
+bool wxPrinterDC::StartDoc(const wxString& WXUNUSED(rsMessage))

 {
 /* TODO:  PM's implementation
    DOCINFO docinfo;
 {
 /* TODO:  PM's implementation
    DOCINFO docinfo;


@@ -167,7 +167,7 @@ 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;


@@ -178,7 +178,7 @@ bool wxPrinterDC::StartDoc(const wxString& message)
 #endif
 
     if (!m_hDC)
 #endif
 
     if (!m_hDC)

-        return FALSE;
+        return false;

 
     int ret =
 #ifndef __WIN32__
 
     int ret =
 #ifndef __WIN32__


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

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

     }
 #endif
     return (ret > 0);
 */
     }
 #endif
     return (ret > 0);
 */

-    return(TRUE);
-}
+    return true;
+} // end of wxPrinterDC::StartDoc

 
 

-void wxPrinterDC::EndDoc(void)
+void wxPrinterDC::EndDoc()

 {
 //    if (m_hDC) ::EndDoc((HDC) m_hDC);
 {
 //    if (m_hDC) ::EndDoc((HDC) m_hDC);

-}
+} // end of wxPrinterDC::EndDoc

 
 

-void wxPrinterDC::StartPage(void)
+void wxPrinterDC::StartPage()

 {
 //    if (m_hDC)
 //        ::StartPage((HDC) m_hDC);
 {
 //    if (m_hDC)
 //        ::StartPage((HDC) m_hDC);

-}
+} // end of wxPrinterDC::StartPage

 
 

-void wxPrinterDC::EndPage(void)
+void wxPrinterDC::EndPage()

 {
 //    if (m_hDC)
 //        ::EndPage((HDC) m_hDC);
 {
 //    if (m_hDC)
 //        ::EndPage((HDC) m_hDC);

-}
-
+} // end of wxPrinterDC::EndPage
+#if 0

 // Returns default device and port names
 // Returns default device and port names

-static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
+static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName )

 {
 {

-    deviceName = "";
+    rsDeviceName = wxEmptyString;

 /*
     LPDEVNAMES  lpDevNames;
     LPSTR       lpszDriverName;
 /*
     LPDEVNAMES  lpDevNames;
     LPSTR       lpszDriverName;


@@ -256,7 +256,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
 
         if (pd.hDevNames)
             GlobalFree(pd.hDevNames);
 

-        return FALSE;
+        return false;

     }
 
     if (pd.hDevNames)
     }
 
     if (pd.hDevNames)


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

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

 */
 */

-    return(TRUE);
-}
+    return true;
+} // end of wxGetDefaultDeviceName
+#endif

 
 // Gets an HDC for the specified printer configuration
 
 // Gets an HDC for the specified printer configuration

-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
+WXHDC WXDLLEXPORT wxGetPrinterDC( const wxPrintData& WXUNUSED(rPrintDataConst) )

 {
 {

-    HDC   hDC;
+    HDC   hDC = NULLHANDLE;

 /*
     wxPrintData printData = printDataConst;
     printData.ConvertToNative();
 /*
     wxPrintData printData = printDataConst;
     printData.ConvertToNative();


@@ -297,7 +298,7 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     wxChar* deviceName;
     wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32
 
     wxChar* deviceName;
     wxChar* portName = (wxChar*) NULL; // Obsolete in WIN32
 

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

         deviceName = (wxChar*) NULL;
     else
         deviceName = WXSTRINGCAST devNameStr;
         deviceName = (wxChar*) NULL;
     else
         deviceName = WXSTRINGCAST devNameStr;


@@ -309,13 +310,13 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     if ( hDevMode )
         lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
 
     if ( hDevMode )
         lpDevMode = (DEVMODE*) GlobalLock(hDevMode);
 

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

     {
         // 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, T("Could not get default device name.") );
+        wxASSERT_MSG( ret, wxT("Could not get default device name.") );

 
         deviceName = WXSTRINGCAST devNameStr;
     }
 
         deviceName = WXSTRINGCAST devNameStr;
     }


@@ -330,5 +331,39 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
         GlobalUnlock(hDevMode);
 */
     return (WXHDC) hDC;
         GlobalUnlock(hDevMode);
 */
     return (WXHDC) hDC;

-}
+} // end of wxGetPrinterDC
+
+void wxPrinterDC::DoDrawBitmap( const wxBitmap& rBmp,
+                                wxCoord WXUNUSED(vX),
+                                wxCoord WXUNUSED(vY),
+                                bool WXUNUSED(bUseMask))
+{
+    wxCHECK_RET( rBmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
+
+//    int                             nWidth  = rBmp.GetWidth();
+//    int                             nHeight = rBmp.GetHeight();
+
+    // TODO:
+
+} // end of wxPrinterDC::DoDrawBitmap
+
+bool wxPrinterDC::DoBlit( wxCoord WXUNUSED(vXdest),
+                          wxCoord WXUNUSED(vYdest),
+                          wxCoord WXUNUSED(vWidth),
+                          wxCoord WXUNUSED(vHeight),
+                          wxDC* WXUNUSED(pSource),
+                          wxCoord WXUNUSED(vXsrc),
+                          wxCoord WXUNUSED(vYsrc),
+                          int WXUNUSED(nRop),
+                          bool WXUNUSED(bUseMask),
+                          wxCoord WXUNUSED(xsrcMask),
+                          wxCoord WXUNUSED(ysrcMask) )
+{
+    bool bSuccess = true;
+
+    // TODO:
+
+    return bSuccess;
+} // end of wxPrintDC::DoBlit

 
 

+#endif //wxUSE_PRINTING_ARCHITECTURE