Better markup.

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 24f69980e5ccc17d26f9215d8f4ee3a9904b26cc..d0114adf29bc80b47db4792a6e9f169d1e606141 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -13,13 +13,16 @@
 #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
 
 #include "wx/defs.h"
     #pragma interface "prntdlgg.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/dialog.h"
+#include "wx/cmndata.h"

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


@@ -28,11 +31,11 @@
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxChoice;
+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
 // ----------------------------------------------------------------------------


@@ -72,10 +75,9 @@ enum
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 

+#if wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
 {
 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);


@@ -118,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)


@@ -136,27 +137,31 @@ public:
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 

-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

 
 public:
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;
 
 public:
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;

-    wxChoice*           m_paperTypeChoice;
+    wxComboBox*           m_paperTypeChoice;

 
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 #endif // wxUSE_POSTSCRIPT
 
 #if 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
 {
 
 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();


@@ -164,7 +169,7 @@ public:
 
     void OnPrinter(wxCommandEvent& event);
 
 
     void OnPrinter(wxCommandEvent& event);
 

-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:
     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:


@@ -174,7 +179,7 @@ public:
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;

-    wxChoice*       m_paperTypeChoice;
+    wxComboBox*       m_paperTypeChoice;

 
     static bool     m_pageSetupDialogCancelled;
 
 
     static bool     m_pageSetupDialogCancelled;
 


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

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)

 };
 
 };
 

+#endif
+

 #endif
 // __PRINTDLGH_G__
 #endif
 // __PRINTDLGH_G__