changed removed wxToUpper to standard toupper

[wxWidgets.git] / include / wx / msw / printdlg.h

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index ba5af57c5e1e7e9bc6d79c00587eee5d06221c7d..655a1ad3d6bc05a03bcc1ec8e6ff79e67c87241d 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PRINTDLGH__
-#define __PRINTDLGH__
+#ifndef _WX_PRINTDLG_H_
+#define _WX_PRINTDLG_H_
 
 #ifdef __GNUG__
 #pragma interface "printdlg.h"
@@ -29,24 +29,23 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog
 {
   DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 
- private:
-  wxPrintData printData;
-  wxDC *printerDC;
-  bool destroyDC;
-  char *deviceName;
-  char *driverName;
-  char *portName;
-  wxWindow *dialogParent;
- public:
+public:
   wxPrintDialog(void);
-  wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL);
+  wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
   ~wxPrintDialog(void);
 
-  bool Create(wxWindow *parent, wxPrintData* data = NULL);
+  bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
   virtual int ShowModal(void);
 
-  inline wxPrintData& GetPrintData(void) { return printData; }
+  inline wxPrintDialogData& GetPrintDialogData(void) { return m_printDialogData; }
+  inline wxPrintData& GetPrintData(void) { return m_printDialogData.GetPrintData(); }
   virtual wxDC *GetPrintDC(void);
+
+private:
+  wxPrintDialogData m_printDialogData;
+  wxDC*             m_printerDC;
+  bool              m_destroyDC;
+  wxWindow*         m_dialogParent;
 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
@@ -68,4 +67,4 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 };
 
 #endif
-    // __PRINTDLGH__
+    // _WX_PRINTDLG_H_