Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of the class naming conflict with the base header

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2004-10-21 17:36:01 +00:00
parent b715de93a6
commit b5f10b014c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/os2/print.h
View File

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