Found bug that skrewed up display wrt horizontal

[wxWidgets.git] / src / stubs / print.cpp

diff --git a/src/stubs/print.cpp b/src/stubs/print.cpp
index 2aba87f3d4d7a1c35933ceec702f05f51627a157..d694aadd4f7ad7a5ef608dca07623e87afb85918 100644 (file)
--- a/src/stubs/print.cpp
+++ b/src/stubs/print.cpp
@@ -13,12 +13,11 @@
 #pragma implementation "print.h"
 #endif
 
 #pragma implementation "print.h"
 #endif
 

-#include "wx/print.h"
+#include "wx/stubs/print.h"
+#include "wx/stubs/printdlg.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)

-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-#endif
+IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)

 
 /*
  * Printer
 
 /*
  * Printer


@@ -41,13 +40,13 @@ bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 
 bool wxPrinter::PrintDialog(wxWindow *parent)
 {
 
 bool wxPrinter::PrintDialog(wxWindow *parent)
 {

-    wxPrintDialog dialog(parent, & printData);
+    wxPrintDialog dialog(parent, & m_printData);

     return (dialog.ShowModal() == wxID_OK);
 }
 
 bool wxPrinter::Setup(wxWindow *parent)
 {
     return (dialog.ShowModal() == wxID_OK);
 }
 
 bool wxPrinter::Setup(wxWindow *parent)
 {

-    wxPrintDialog dialog(parent, & printData);
+    wxPrintDialog dialog(parent, & m_printData);

     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
 }
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
 }


@@ -56,25 +55,25 @@ bool wxPrinter::Setup(wxWindow *parent)
  * Print preview
  */
 
  * Print preview
  */
 

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

   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 

-wxWindowsPrintPreview::~wxWindowsPrintPreview()
+wxPrintPreview::~wxPrintPreview()

 {
 }
 
 {
 }
 

-bool wxWindowsPrintPreview::Print(bool interactive)
+bool wxPrintPreview::Print(bool interactive)

 {
 {

-    if (!printPrintout)
+    if (!m_printPrintout)

         return FALSE;
         return FALSE;

-    wxPrinter printer(&printData);
-    return printer.Print(previewFrame, printPrintout, interactive);
+    wxPrinter printer(&m_printData);
+    return printer.Print(m_previewFrame, m_printPrintout, interactive);

 }
 
 }
 

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

 {
     // TODO
 }
 {
     // TODO
 }