gave default value of wxID_ANY to id parameter of wxStaticLine ctor as nobody uses...

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 1396ddc026bdd04addb499c10fe91f9767ed9e47..3f76a0b2074420401c205a10b800e596c1f909fb 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -44,7 +44,7 @@ public:
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }

-    
+   

 private:
     void* m_devMode;
     void* m_devNames;
 private:
     void* m_devMode;
     void* m_devNames;


@@ -54,7 +54,7 @@ private:
 };
     
 // ---------------------------------------------------------------------------
 };
     
 // ---------------------------------------------------------------------------

-// wxPrinterDialog: the common dialog for printing.
+// wxWindowsPrintDialog: the MSW dialog for printing

 // ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase
 // ---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase


@@ -89,28 +89,33 @@ private:
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 

-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+// ---------------------------------------------------------------------------
+// wxWindowsPageSetupDialog: the MSW page setup dialog 
+// ---------------------------------------------------------------------------

 
 

+class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase
+{

 public:
 public:

-    wxPageSetupDialog();
-    wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-    virtual ~wxPageSetupDialog();
+    wxWindowsPageSetupDialog();
+    wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    virtual ~wxWindowsPageSetupDialog();

 
 

-    bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);

     virtual int ShowModal();
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 
     virtual int ShowModal();
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 

-    wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
+    virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; }

 
 private:
 
 private:

-    wxPageSetupData   m_pageSetupData;
-    wxWindow*         m_dialogParent;
-    void*             m_pageDlg;
+    wxPageSetupDialogData   m_pageSetupData;
+    wxWindow*               m_dialogParent;
+    
+    // holds MSW handle
+    void*                   m_pageDlg;

 
 

-    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog)

 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE