don't place NULL pointers in the GDK window array in GTKGetWindow()

[wxWidgets.git] / interface / wx / printdlg.h

diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h
index 4a174546bbd37beff288f9e825fefa0239f72fb1..4cb99f4f698b828653b15d548cf45afc2d56fa95 100644 (file)
--- a/interface/wx/printdlg.h
+++ b/interface/wx/printdlg.h
@@ -8,7 +8,6 @@
 
 /**
     @class wxPrintDialog
 
 /**
     @class wxPrintDialog

-    @wxheader{printdlg.h}

 
     This class represents the print and print setup common dialogs.
     You may obtain a wxPrinterDC device context from a successfully dismissed
 
     This class represents the print and print setup common dialogs.
     You may obtain a wxPrinterDC device context from a successfully dismissed


@@ -38,7 +37,7 @@ public:
         If GetPrintDC() has not been called, the device context obtained by
         the dialog (if any) will be deleted.
     */
         If GetPrintDC() has not been called, the device context obtained by
         the dialog (if any) will be deleted.
     */

-    ~wxPrintDialog();
+    virtual ~wxPrintDialog();

 
     /**
         Returns the device context created by the print dialog, if any.
 
     /**
         Returns the device context created by the print dialog, if any.


@@ -47,13 +46,13 @@ public:
         is transferred to the application, so it must then be deleted
         explicitly.
     */
         is transferred to the application, so it must then be deleted
         explicitly.
     */

-    wxDC* GetPrintDC();
+    virtual wxDC* GetPrintDC();

 
     /**
         Returns the @ref overview_printing_printdata "print dialog data" associated
         with the print dialog.
     */
 
     /**
         Returns the @ref overview_printing_printdata "print dialog data" associated
         with the print dialog.
     */

-    wxPrintDialogData GetPrintDialogData();
+    virtual wxPrintDialogData& GetPrintDialogData();

 
     /**
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and @c
 
     /**
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and @c


@@ -62,14 +61,13 @@ public:
         After this function is called, a device context may be retrievable using
         GetPrintDC().
     */
         After this function is called, a device context may be retrievable using
         GetPrintDC().
     */

-    int ShowModal();
+    virtual int ShowModal();

 };
 
 
 
 /**
     @class wxPageSetupDialog
 };
 
 
 
 /**
     @class wxPageSetupDialog

-    @wxheader{printdlg.h}

 
     This class represents the page setup common dialog. In MSW, the page setup
     dialog is standard from Windows 95 on, replacing the print setup dialog (which
 
     This class represents the page setup common dialog. In MSW, the page setup
     dialog is standard from Windows 95 on, replacing the print setup dialog (which


@@ -95,8 +93,7 @@ public:
     @library{wxcore}
     @category{printing}
 
     @library{wxcore}
     @category{printing}
 

-    @see @ref overview_printing "Printing framework overview",
-         wxPrintDialog, wxPageSetupDialogData
+    @see @ref overview_printing, wxPrintDialog, wxPageSetupDialogData

 */
 class wxPageSetupDialog : public wxDialog
 {
 */
 class wxPageSetupDialog : public wxDialog
 {


@@ -112,7 +109,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxPageSetupDialog();
+    virtual ~wxPageSetupDialog();

 
     /**
         Returns the wxPageSetupDialogData object associated with the dialog.
 
     /**
         Returns the wxPageSetupDialogData object associated with the dialog.