From: David Webster <Dave.Webster@bhmi.com>
Date: Thu, 21 Oct 2004 17:36:01 +0000 (+0000)
Subject: Get rid of the class naming conflict with the base header
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b5f10b014c48082160c6315fd4fd17cf981c5b30

Get rid of the class naming conflict with the base header


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/os2/print.h b/include/wx/os2/print.h
index 23db48af6d..baf6ecbcf9 100644
--- a/include/wx/os2/print.h
+++ b/include/wx/os2/print.h
@@ -18,13 +18,13 @@
  * Represents the printer: manages printing a wxPrintout object
  */
 
-class WXDLLEXPORT wxPrinter: public wxPrinterBase
+class WXDLLEXPORT wxOS2Printer: public wxPrinterBase
 {
   DECLARE_DYNAMIC_CLASS(wxPrinter)
 
  public:
-  wxPrinter(wxPrintData *data = NULL);
-  ~wxPrinter();
+  wxOS2Printer(wxPrintData *data = NULL);
+  ~wxOS2Printer();
 
   virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
   virtual wxDC* PrintDialog(wxWindow *parent);
@@ -37,13 +37,13 @@ private:
  * Programmer creates an object of this class to preview a wxPrintout.
  */
 
-class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
+class WXDLLEXPORT wxOS2PrintPreview: public wxPrintPreviewBase
 {
   DECLARE_CLASS(wxPrintPreview)
 
  public:
-  wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-  ~wxPrintPreview();
+  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
+  ~wxOS2PrintPreview();
 
   virtual bool Print(bool interactive);
   virtual void DetermineScaling();