Better markup.

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 99d4d2a97402a29383487a0bd6eaa76bbe3eec2c..d0114adf29bc80b47db4792a6e9f169d1e606141 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,7 +13,7 @@
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "prntdlgg.h"
 #endif
 
     #pragma interface "prntdlgg.h"
 #endif
 


@@ -22,6 +22,7 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"

+#include "wx/cmndata.h"

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


@@ -34,7 +35,7 @@ class WXDLLEXPORT wxComboBox;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;

-
+class WXDLLEXPORT wxPageSetupData;

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


@@ -77,8 +78,6 @@ enum
 #if wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
 {
 #if wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
 {

-    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
-

 public:
     wxGenericPrintDialog(wxWindow *parent,
                          wxPrintDialogData* data = (wxPrintDialogData*)NULL);
 public:
     wxGenericPrintDialog(wxWindow *parent,
                          wxPrintDialogData* data = (wxPrintDialogData*)NULL);


@@ -121,12 +120,11 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)

 };
 
 class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
 {
 };
 
 class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
 {

-    DECLARE_CLASS(wxGenericPrintSetupDialog)
-

 public:
     // There are no configuration options for the dialog, so we
     // just pass the wxPrintData object (no wxPrintSetupDialogData class needed)
 public:
     // There are no configuration options for the dialog, so we
     // just pass the wxPrintData object (no wxPrintSetupDialogData class needed)


@@ -152,16 +150,18 @@ public:
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 #endif // wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 #endif // wxUSE_POSTSCRIPT

+
+private:
+    DECLARE_CLASS(wxGenericPrintSetupDialog)

 };
 #endif
     // wxUSE_POSTSCRIPT
 
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {
 };
 #endif
     // wxUSE_POSTSCRIPT
 
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {

-    DECLARE_CLASS(wxGenericPageSetupDialog)
-

 public:
 public:

-    wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
+    wxGenericPageSetupDialog(wxWindow *parent = NULL,
+                             wxPageSetupData* data = NULL);

     virtual ~wxGenericPageSetupDialog();
 
     virtual bool TransferDataFromWindow();
     virtual ~wxGenericPageSetupDialog();
 
     virtual bool TransferDataFromWindow();


@@ -187,6 +187,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)

 };
 
 #endif
 };
 
 #endif