synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / generic / prntdlgg.h

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index d21d26c0dede22d2ba402c093e3ed85f1c54d9cd..5271b3891eca24eb0d987024fda1d3a3904c47bd 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        prntdlgg.h
+// Name:        wx/generic/prntdlgg.h

 // Purpose:     wxGenericPrintDialog, wxGenericPrintSetupDialog,
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Purpose:     wxGenericPrintDialog, wxGenericPrintSetupDialog,
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart


@@ -23,17 +23,18 @@
 #include "wx/printdlg.h"
 #include "wx/listctrl.h"
 
 #include "wx/printdlg.h"
 #include "wx/listctrl.h"
 

+#include "wx/dc.h"

 #if wxUSE_POSTSCRIPT
     #include "wx/dcps.h"
 #endif
 
 #if wxUSE_POSTSCRIPT
     #include "wx/dcps.h"
 #endif
 

-class WXDLLEXPORT wxTextCtrl;
-class WXDLLEXPORT wxButton;
-class WXDLLEXPORT wxCheckBox;
-class WXDLLEXPORT wxComboBox;
-class WXDLLEXPORT wxStaticText;
-class WXDLLEXPORT wxRadioBox;
-class WXDLLEXPORT wxPageSetupData;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxButton;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxStaticText;
+class WXDLLIMPEXP_FWD_CORE wxRadioBox;
+class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -77,7 +78,7 @@ enum
 // wxPostScriptNativeData
 //----------------------------------------------------------------------------
 
 // wxPostScriptNativeData
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase
+class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase

 {
 public:
     wxPostScriptPrintNativeData();
 {
 public:
     wxPostScriptPrintNativeData();


@@ -86,7 +87,8 @@ public:
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
 

-    virtual bool Ok() const { return true; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return true; }

 
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
     const wxString& GetPrinterOptions() const { return m_printerOptions; }
 
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
     const wxString& GetPrinterOptions() const { return m_printerOptions; }


@@ -135,11 +137,11 @@ private:
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase
+class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase

 {
 public:
     wxGenericPrintDialog(wxWindow *parent,
 {
 public:
     wxGenericPrintDialog(wxWindow *parent,

-                         wxPrintDialogData* data = (wxPrintDialogData*)NULL);
+                         wxPrintDialogData* data = NULL);

     wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);
 
     virtual ~wxGenericPrintDialog();
     wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);
 
     virtual ~wxGenericPrintDialog();


@@ -180,7 +182,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
 };
 

-class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
+class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog

 {
 public:
     // There are no configuration options for the dialog, so we
 {
 public:
     // There are no configuration options for the dialog, so we


@@ -218,7 +220,7 @@ private:
 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT
 

-class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase
+class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase

 {
 public:
     wxGenericPageSetupDialog(wxWindow *parent = NULL,
 {
 public:
     wxGenericPageSetupDialog(wxWindow *parent = NULL,