Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

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

diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp
index ccfdcc997a58473d1c236268a2f801d291cebd21..0f05f726185ca818f3926fa2b8f207af0027acaa 100644 (file)
--- a/src/msw/printwin.cpp
+++ b/src/msw/printwin.cpp
@@ -6,286 +6,358 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

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

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "printwin.h"
+    #pragma implementation "printwin.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/defs.h"
 
 #endif
 
 #include "wx/defs.h"
 

-#define WINDOWS_PRINTING    (wxTheApp->GetPrintMode() == wxPRINT_WINDOWS)
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/dc.h"
-#include "wx/app.h"
-#include "wx/msgdlg.h"
+    #include "wx/window.h"
+    #include "wx/msw/private.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/msgdlg.h"
+    #include "wx/intl.h"

 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/msw/printwin.h"
 #include "wx/dcprint.h"
 #include "wx/printdlg.h"

+#include "wx/log.h"

 #include "wx/msw/private.h"
 
 #include <stdlib.h>
 #include "wx/msw/private.h"
 
 #include <stdlib.h>

-#include <windows.h>
-#include <commdlg.h>

 
 

-// Clash with Windows header files
-#ifdef StartDoc
-#undef StartDoc
-#endif
+#include "wx/msw/private.h"
+
+#include <commdlg.h>

 
 #ifndef __WIN32__
 
 #ifndef __WIN32__

-#include <print.h>
+    #include <print.h>

 #endif
 
 #endif
 

+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+

 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 
 LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 

+// ---------------------------------------------------------------------------
+// wxWin macros
+// ---------------------------------------------------------------------------
+

 #if !USE_SHARED_LIBRARY
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
+    IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)

 #endif
 
 #endif
 

-/*
- * Printer
- */
- 
-wxWindowsPrinter::wxWindowsPrinter(wxPrintData *data):
-  wxPrinterBase(data)
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// Printer
+// ---------------------------------------------------------------------------
+
+wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
+                : wxPrinterBase(data)

 {
 {

-  lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
+    m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());

 }
 
 }
 

-wxWindowsPrinter::~wxWindowsPrinter(void)
+wxWindowsPrinter::~wxWindowsPrinter()

 {
 {

-  FreeProcInstance((FARPROC) lpAbortProc);
+    // avoids mingw warning about statement with no effect (FreeProcInstance
+    // doesn't do anything under Win32)
+#ifndef __GNUWIN32__
+    FreeProcInstance((FARPROC) m_lpAbortProc);
+#endif

 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {

-  abortIt = FALSE;
-  abortWindow = NULL;
-
-  if (!printout)
-    return FALSE;
-    
-  printout->SetIsPreview(FALSE);
-  printout->OnPreparePrinting();
-
-  // Get some parameters from the printout, if defined
-  int fromPage, toPage;
-  int minPage, maxPage;
-  printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);
-
-  if (maxPage == 0)
-    return FALSE;
-
-  printData.SetMinPage(minPage);
-  printData.SetMaxPage(maxPage);
-  if (fromPage != 0)
-    printData.SetFromPage(fromPage);
-  if (toPage != 0)
-    printData.SetToPage(toPage);
-
-  if (minPage != 0)
-  {
-    printData.EnablePageNumbers(TRUE);
-    if (printData.GetFromPage() < printData.GetMinPage())
-      printData.SetFromPage(printData.GetMinPage());
-    else if (printData.GetFromPage() > printData.GetMaxPage())
-      printData.SetFromPage(printData.GetMaxPage());
-    if (printData.GetToPage() > printData.GetMaxPage())
-      printData.SetToPage(printData.GetMaxPage());
-    else if (printData.GetToPage() < printData.GetMinPage())
-      printData.SetToPage(printData.GetMinPage());
-  }
-  else
-    printData.EnablePageNumbers(FALSE);
-  
-  // Create a suitable device context  
-  wxDC *dc = NULL;
-  if (prompt)
-  {
-        wxPrintDialog dialog(parent, & printData);
-        if (dialog.ShowModal() == wxID_OK)
-        {
-          dc = dialog.GetPrintDC();
-          printData = dialog.GetPrintData();
-        }
-  }
-  else
-  {
-      dc = new wxPrinterDC("", "", "", FALSE, printData.GetOrientation());
-  }
-
-  // May have pressed cancel.
-  if (!dc || !dc->Ok())
-  {
-    if (dc) delete dc;
-    return FALSE;
-  }
-  
-  int logPPIScreenX = 0;
-  int logPPIScreenY = 0;
-  int logPPIPrinterX = 0;
-  int logPPIPrinterY = 0;
-
-  HDC hdc = ::GetDC(NULL);
-  logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
-  logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
-  ::ReleaseDC(NULL, hdc);
-
-  logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
-  logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
-  if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
-  {
-    delete dc;
-    return FALSE;
-  }
+    sm_abortIt = FALSE;
+    sm_abortWindow = NULL;

 
 

-  printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
-  printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+    if (!printout)
+        return FALSE;

 
 

-  // Set printout parameters  
-  printout->SetDC(dc);
+    printout->SetIsPreview(FALSE);

 
 

-  int w, h;
-  long ww, hh;
-  dc->GetSize(&w, &h);
-  printout->SetPageSizePixels((int)w, (int)h);
-  dc->GetSizeMM(&ww, &hh);
-  printout->SetPageSizeMM((int)ww, (int)hh);
+    // 4/9/99, JACS: this is a silly place to allow preparation, considering
+    // the DC and no parameters have been set in the printout object.
+    // Moved further down.
+    // printout->OnPreparePrinting();

 
 

-  // Create an abort window
-  wxBeginBusyCursor();
+    // Get some parameters from the printout, if defined
+    int fromPage, toPage;
+    int minPage, maxPage;
+    printout->GetPageInfo(&minPage, &maxPage, &fromPage, &toPage);

 
 

-  wxWindow *win = CreateAbortWindow(parent, printout);
-  wxYield();
-  ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)(HDC, int)) lpAbortProc);
+    if (maxPage == 0)
+        return FALSE;

 
 

-  if (!win)
-  {
-    wxEndBusyCursor();
-    wxMessageBox("Sorry, could not create an abort dialog.", "Print Error", wxOK, parent);
-    delete dc;
-  }
-  abortWindow = win;
-  abortWindow->Show(TRUE);
-  wxYield();
-
-  printout->OnBeginPrinting();
-  
-  bool keepGoing = TRUE;
-
-  int copyCount;
-  for (copyCount = 1; copyCount <= printData.GetNoCopies(); copyCount ++)
-  {
-    if (!printout->OnBeginDocument(printData.GetFromPage(), printData.GetToPage()))
+    m_printDialogData.SetMinPage(minPage);
+    m_printDialogData.SetMaxPage(maxPage);
+    if (fromPage != 0)
+        m_printDialogData.SetFromPage(fromPage);
+    if (toPage != 0)
+        m_printDialogData.SetToPage(toPage);
+
+    if (minPage != 0)
+    {
+        m_printDialogData.EnablePageNumbers(TRUE);
+        if (m_printDialogData.GetFromPage() < m_printDialogData.GetMinPage())
+            m_printDialogData.SetFromPage(m_printDialogData.GetMinPage());
+        else if (m_printDialogData.GetFromPage() > m_printDialogData.GetMaxPage())
+            m_printDialogData.SetFromPage(m_printDialogData.GetMaxPage());
+        if (m_printDialogData.GetToPage() > m_printDialogData.GetMaxPage())
+            m_printDialogData.SetToPage(m_printDialogData.GetMaxPage());
+        else if (m_printDialogData.GetToPage() < m_printDialogData.GetMinPage())
+            m_printDialogData.SetToPage(m_printDialogData.GetMinPage());
+    }
+    else
+        m_printDialogData.EnablePageNumbers(FALSE);
+
+    // Create a suitable device context
+    wxDC *dc = NULL;
+    if (prompt)
+    {
+        dc = PrintDialog(parent);
+        if (!dc)
+            return FALSE;
+    }
+    else
+    {
+        //      dc = new wxPrinterDC("", "", "", FALSE, m_printData.GetOrientation());
+        dc = new wxPrinterDC(m_printDialogData.GetPrintData());
+    }
+
+    // May have pressed cancel.
+    if (!dc || !dc->Ok())
+    {
+        if (dc) delete dc;
+        return FALSE;
+    }
+
+    int logPPIScreenX = 0;
+    int logPPIScreenY = 0;
+    int logPPIPrinterX = 0;
+    int logPPIPrinterY = 0;
+
+    HDC hdc = ::GetDC(NULL);
+    logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
+    logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
+    ::ReleaseDC(NULL, hdc);
+
+    logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
+    logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
+    if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
+    {
+        delete dc;
+        return FALSE;
+    }
+
+    printout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
+    printout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+
+    // Set printout parameters
+    printout->SetDC(dc);
+
+    int w, h;
+    dc->GetSize(&w, &h);
+    printout->SetPageSizePixels((int)w, (int)h);
+
+    dc->GetSizeMM(&w, &h);
+    printout->SetPageSizeMM((int)w, (int)h);
+
+    // Create an abort window
+    wxBeginBusyCursor();
+
+    printout->OnPreparePrinting();
+
+    wxWindow *win = CreateAbortWindow(parent, printout);
+    wxYield();
+
+#if defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#ifdef STRICT
+    ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
+#else
+    ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);
+#endif
+#else
+    ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
+        // cast it to right type only if required
+        // FIXME it's really cdecl and we're casting it to stdcall - either there is
+        //       something I don't understand or it will crash at first usage
+#ifdef STRICT
+        (HDC, int)
+#else
+        ()
+#endif
+        )m_lpAbortProc);
+#endif
+
+    if (!win)

     {
     {

-      wxEndBusyCursor();
-      wxMessageBox("Could not start printing.", "Print Error", wxOK, parent);
-      break;
+        wxEndBusyCursor();
+        wxLogDebug(wxT("Could not create an abort dialog."));
+
+        delete dc;

     }
     }

-    if (abortIt)
-      break;
+    sm_abortWindow = win;
+    sm_abortWindow->Show(TRUE);
+    wxSafeYield();
+
+    printout->OnBeginPrinting();
+
+    bool keepGoing = TRUE;

 
 

-    int pn;
-    for (pn = printData.GetFromPage(); keepGoing && (pn <= printData.GetToPage()) && printout->HasPage(pn);
-         pn++)
+    int copyCount;
+    for (copyCount = 1; copyCount <= m_printDialogData.GetNoCopies(); copyCount ++)

     {
     {

-      if (abortIt)
-      {
-        keepGoing = FALSE;
-        break;
-      }
-      else
-      {
-//        int dcID = ::SaveDC(dc->GetHDC());
-        dc->StartPage();
-        printout->OnPrintPage(pn);
-        dc->EndPage();
-//        ::RestoreDC(dc->GetHDC(), dcID);
-      }
+        if (!printout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+        {
+            wxEndBusyCursor();
+            wxLogError(_("Could not start printing."));
+            break;
+        }
+        if (sm_abortIt)
+            break;
+
+        int pn;
+        for (pn = m_printDialogData.GetFromPage(); keepGoing && (pn <= m_printDialogData.GetToPage()) && printout->HasPage(pn);
+        pn++)
+        {
+            if (sm_abortIt)
+            {
+                keepGoing = FALSE;
+                break;
+            }
+            else
+            {
+                dc->StartPage();
+                printout->OnPrintPage(pn);
+                dc->EndPage();
+            }
+        }
+        printout->OnEndDocument();

     }
     }

-    printout->OnEndDocument();
-  }

 
 

-  printout->OnEndPrinting();
+    printout->OnEndPrinting();

 
 

-  if (abortWindow)
-  {
-    abortWindow->Show(FALSE);
-    delete abortWindow;
-    abortWindow = NULL;
-  }
+    if (sm_abortWindow)
+    {
+        sm_abortWindow->Show(FALSE);
+        delete sm_abortWindow;
+        sm_abortWindow = NULL;
+    }

 
 

-  wxEndBusyCursor();
+    wxEndBusyCursor();
+
+    delete dc;

 
 

-  delete dc;
-  
-  return TRUE;
+    return TRUE;

 }
 
 }
 

-bool wxWindowsPrinter::PrintDialog(wxWindow *parent)
+wxDC* wxWindowsPrinter::PrintDialog(wxWindow *parent)

 {
 {

-  wxPrintDialog dialog(parent, & printData);
-  return (dialog.ShowModal() == wxID_OK);
+    wxDC* dc = (wxDC*) NULL;
+
+    wxPrintDialog dialog(parent, & m_printDialogData);
+    int ret = dialog.ShowModal();
+
+    if (ret == wxID_OK)
+    {
+        dc = dialog.GetPrintDC();
+        m_printDialogData = dialog.GetPrintDialogData();
+    }
+
+    return dc;

 }
 
 bool wxWindowsPrinter::Setup(wxWindow *parent)
 {
 }
 
 bool wxWindowsPrinter::Setup(wxWindow *parent)
 {

-  wxPrintDialog dialog(parent, & printData);
-  dialog.GetPrintData().SetSetupDialog(TRUE);
-  return (dialog.ShowModal() == wxID_OK);
+    wxPrintDialog dialog(parent, & m_printDialogData);
+    dialog.GetPrintDialogData().SetSetupDialog(TRUE);
+
+    int ret = dialog.ShowModal();
+
+    if (ret == wxID_OK)
+    {
+        m_printDialogData = dialog.GetPrintDialogData();
+    }
+
+    return (ret == wxID_OK);

 }
 
 /*
 }
 
 /*

- * Print preview
- */
+* Print preview
+*/

 
 

-wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
-  wxPrintPreviewBase(printout, printoutForPrinting, data)
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+                                             wxPrintout *printoutForPrinting,
+                                             wxPrintDialogData *data)
+                     : wxPrintPreviewBase(printout, printoutForPrinting, data)

 {
 {

-  DetermineScaling();
+    DetermineScaling();

 }
 
 }
 

-wxWindowsPrintPreview::~wxWindowsPrintPreview(void)
+wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout,
+                                             wxPrintout *printoutForPrinting,
+                                             wxPrintData *data)
+                     : wxPrintPreviewBase(printout, printoutForPrinting, data)
+{
+    DetermineScaling();
+}
+
+wxWindowsPrintPreview::~wxWindowsPrintPreview()

 {
 }
 
 bool wxWindowsPrintPreview::Print(bool interactive)
 {
 {
 }
 
 bool wxWindowsPrintPreview::Print(bool interactive)
 {

-  if (!printPrintout)
-    return FALSE;
-  wxWindowsPrinter printer(&printData);
-  return printer.Print(previewFrame, printPrintout, interactive);
+    if (!m_printPrintout)
+        return FALSE;
+    wxWindowsPrinter printer(&m_printDialogData);
+    return printer.Print(m_previewFrame, m_printPrintout, interactive);

 }
 
 }
 

-void wxWindowsPrintPreview::DetermineScaling(void)
+void wxWindowsPrintPreview::DetermineScaling()

 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);
 {
     HDC dc = ::GetDC(NULL);
     int screenWidth = ::GetDeviceCaps(dc, HORZSIZE);

-//    int screenHeight = ::GetDeviceCaps(dc, VERTSIZE);
+    //    int screenHeight = ::GetDeviceCaps(dc, VERTSIZE);

     int screenXRes = ::GetDeviceCaps(dc, HORZRES);
     int screenXRes = ::GetDeviceCaps(dc, HORZRES);

-//    int screenYRes = ::GetDeviceCaps(dc, VERTRES);
+    //    int screenYRes = ::GetDeviceCaps(dc, VERTRES);

     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);
     int logPPIScreenX = ::GetDeviceCaps(dc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(dc, LOGPIXELSY);

-    previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);
+    m_previewPrintout->SetPPIScreen(logPPIScreenX, logPPIScreenY);

 
     ::ReleaseDC(NULL, dc);
 
     // Get a device context for the currently selected printer
 
     ::ReleaseDC(NULL, dc);
 
     // Get a device context for the currently selected printer

-    wxPrinterDC printerDC("", "", "", FALSE, printData.GetOrientation());
+    wxPrinterDC printerDC(m_printDialogData.GetPrintData());

 
     int printerWidth = 150;
     int printerHeight = 250;
 
     int printerWidth = 150;
     int printerHeight = 250;


@@ -294,34 +366,34 @@ void wxWindowsPrintPreview::DetermineScaling(void)
 
     if (printerDC.GetHDC())
     {
 
     if (printerDC.GetHDC())
     {

-      printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
-      printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
-      printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
-      printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
-
-      int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
-      int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
-
-      previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
-      previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
-      
-      if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
-        isOk = FALSE;
+        printerWidth = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZSIZE);
+        printerHeight = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTSIZE);
+        printerXRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), HORZRES);
+        printerYRes = ::GetDeviceCaps((HDC) printerDC.GetHDC(), VERTRES);
+
+        int logPPIPrinterX = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSX);
+        int logPPIPrinterY = ::GetDeviceCaps((HDC) printerDC.GetHDC(), LOGPIXELSY);
+
+        m_previewPrintout->SetPPIPrinter(logPPIPrinterX, logPPIPrinterY);
+        m_previewPrintout->SetPageSizeMM(printerWidth, printerHeight);
+
+        if (logPPIPrinterX == 0 || logPPIPrinterY == 0 || printerWidth == 0 || printerHeight == 0)
+            m_isOk = FALSE;

     }
     else
     }
     else

-      isOk = FALSE;
+        m_isOk = FALSE;

 
 

-    pageWidth = printerXRes;
-    pageHeight = printerYRes;
+    m_pageWidth = printerXRes;
+    m_pageHeight = printerYRes;

 
     // At 100%, the page should look about page-size on the screen.
 
     // At 100%, the page should look about page-size on the screen.

-    previewScale = (float)((float)screenWidth/(float)printerWidth);
-    previewScale = previewScale * (float)((float)screenXRes/(float)printerYRes);
+    m_previewScale = (float)((float)screenWidth/(float)printerWidth);
+    m_previewScale = m_previewScale * (float)((float)screenXRes/(float)printerYRes);

 }
 
 /****************************************************************************
 
 }
 
 /****************************************************************************
 

-    FUNCTION: wxAbortProc()
+  FUNCTION: wxAbortProc()

 
     PURPOSE:  Processes messages for the Abort Dialog box
 
 
     PURPOSE:  Processes messages for the Abort Dialog box
 


@@ -331,19 +403,19 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 {
     MSG msg;
 
 {
     MSG msg;
 

-    if (!wxPrinterBase::abortWindow)              /* If the abort dialog isn't up yet */
+    if (!wxPrinterBase::sm_abortWindow)              /* If the abort dialog isn't up yet */

         return(TRUE);
 
     /* Process messages intended for the abort dialog box */
 
         return(TRUE);
 
     /* Process messages intended for the abort dialog box */
 

-    while (!wxPrinterBase::abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
-        if (!IsDialogMessage((HWND) wxPrinterBase::abortWindow->GetHWND(), &msg)) {
+    while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE))
+        if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) {

             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
 
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
 

-    /* bAbort is TRUE (return is FALSE) if the user has aborted */
+        /* bAbort is TRUE (return is FALSE) if the user has aborted */

 
 

-    return (!wxPrinterBase::abortIt);
+        return (!wxPrinterBase::sm_abortIt);

 }
 
 }