implemented GetBestSize() for wxChoice

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

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index 61fd6e7e993835abbbd6d9bd7d9c27a7c9ca03c5..9073078b2bb14d48c14bb89d25237a19ebc8905a 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -1,32 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.cpp
 // Purpose:     Print framework
 /////////////////////////////////////////////////////////////////////////////
 // Name:        print.cpp
 // Purpose:     Print framework

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "print.h"
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include <stdio.h>
+#include "wx/setup.h"
+#include "wx/list.h"
+#include "wx/utils.h"
+#include "wx/app.h"

 #endif
 
 #endif
 

-#include "wx/stubs/print.h"
-#include "wx/stubs/printdlg.h"
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/os2/print.h"
+#include "wx/generic/prntdlgg.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)

-#endif

 
 /*
  * Printer
  */
 
 /*
  * Printer
  */

- 
+

 wxPrinter::wxPrinter(wxPrintData *data):
 wxPrinter::wxPrinter(wxPrintData *data):

-  wxPrinterBase(data)
+  wxPrinterBase((wxPrintDialogData*)data)

 {
 }
 
 {
 }
 


@@ -40,17 +46,25 @@ bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
     return FALSE;
 }
 
     return FALSE;
 }
 

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

 {
 {

+// TODO:
+/*

     wxPrintDialog dialog(parent, & m_printData);
     wxPrintDialog dialog(parent, & m_printData);

-    return (dialog.ShowModal() == wxID_OK);
+    return (dialog.GetPrintDC());
+*/
+    return NULL;

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

+// TODO:
+/*

     wxPrintDialog dialog(parent, & m_printData);
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);
     wxPrintDialog dialog(parent, & m_printData);
     dialog.GetPrintData().SetSetupDialog(TRUE);
     return (dialog.ShowModal() == wxID_OK);

+*/
+    return FALSE;

 }
 
 /*
 }
 
 /*


@@ -71,8 +85,9 @@ bool wxPrintPreview::Print(bool interactive)
 {
     if (!m_printPrintout)
         return FALSE;
 {
     if (!m_printPrintout)
         return FALSE;

-    wxPrinter printer(&m_printData);
-    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+//    wxPrinter printer(&m_printData);
+//    return printer.Print(m_previewFrame, m_printPrintout, interactive);
+    return FALSE;

 }
 
 void wxPrintPreview::DetermineScaling()
 }
 
 void wxPrintPreview::DetermineScaling()


@@ -80,3 +95,4 @@ void wxPrintPreview::DetermineScaling()
     // TODO
 }
 
     // TODO
 }
 

+#endif  //wxUSE_PRINTING_ARCHITECTURE