replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and...

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 58326a231db23de5996692bf479edb01d6f25be9..6880629ce45d868742d9298b0c396d306d8f9831 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,10 +13,6 @@
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "prntdlgg.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -27,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 wxPageSetupData;

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


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

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

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


@@ -90,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; }


@@ -139,7 +137,7 @@ 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,


@@ -184,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


@@ -222,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,