Better markup.

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 67889251f7cfcb2e52663665826efee24138edb3..d0114adf29bc80b47db4792a6e9f169d1e606141 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -7,142 +7,170 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 

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

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_PRINTING_ARCHITECTURE
+

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

-#include "wx/dc.h"

 #include "wx/cmndata.h"
 #include "wx/cmndata.h"

-#include "wx/dialog.h"

 
 #if wxUSE_POSTSCRIPT
 
 #if wxUSE_POSTSCRIPT

-#include "wx/dcps.h"
+    #include "wx/dcps.h"

 #endif
 
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;
 #endif
 
 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
+// ----------------------------------------------------------------------------

 
 

-/*
-* Simulated Print and Print Setup dialogs
-* for non-Windows platforms (and Windows using PostScript print/preview)
-*/
+// FIXME why all these enums start with 10 or 30?
+
+enum
+{
+    wxPRINTID_STATIC = 10,
+    wxPRINTID_RANGE,
+    wxPRINTID_FROM,
+    wxPRINTID_TO,
+    wxPRINTID_COPIES,
+    wxPRINTID_PRINTTOFILE,
+    wxPRINTID_SETUP
+};

 
 

-#define wxPRINTID_STATIC        10
-#define wxPRINTID_RANGE         11
-#define wxPRINTID_FROM          12
-#define wxPRINTID_TO            13
-#define wxPRINTID_COPIES        14
-#define wxPRINTID_PRINTTOFILE   15
-#define wxPRINTID_SETUP         16
+enum
+{
+    wxPRINTID_LEFTMARGIN = 30,
+    wxPRINTID_RIGHTMARGIN,
+    wxPRINTID_TOPMARGIN,
+    wxPRINTID_BOTTOMMARGIN
+};

 
 

-class WXDLLEXPORT wxGenericPrintDialog: public wxDialog
+enum
+{
+    wxPRINTID_PRINTCOLOUR = 10,
+    wxPRINTID_ORIENTATION,
+    wxPRINTID_COMMAND,
+    wxPRINTID_OPTIONS,
+    wxPRINTID_PAPERSIZE
+};
+
+// ----------------------------------------------------------------------------
+// Simulated Print and Print Setup dialogs for non-Windows platforms (and
+// Windows using PostScript print/preview)
+// ----------------------------------------------------------------------------
+
+#if wxUSE_POSTSCRIPT
+class WXDLLEXPORT wxGenericPrintDialog : public wxDialog

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
-        

 public:
 public:

-    wxGenericPrintDialog(wxWindow *parent, wxPrintDialogData* data = (wxPrintDialogData*) NULL);
-    ~wxGenericPrintDialog();
+    wxGenericPrintDialog(wxWindow *parent,
+                         wxPrintDialogData* data = (wxPrintDialogData*)NULL);
+    wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);
+
+    virtual ~wxGenericPrintDialog();

 
     void OnSetup(wxCommandEvent& event);
     void OnRange(wxCommandEvent& event);
     void OnOK(wxCommandEvent& event);
 
     void OnSetup(wxCommandEvent& event);
     void OnRange(wxCommandEvent& event);
     void OnOK(wxCommandEvent& event);

-    
+

     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     virtual int ShowModal();
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     virtual int ShowModal();
 

-    inline wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+#if wxUSE_POSTSCRIPT
+    wxPrintData& GetPrintData()
+        { return m_printDialogData.GetPrintData(); }
+#endif // wxUSE_POSTSCRIPT
+
+    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }

     wxDC *GetPrintDC();
 
 public:
     wxDC *GetPrintDC();
 
 public:

-    wxStaticText*       m_printerMessage;
+//    wxStaticText*       m_printerMessage;

     wxButton*           m_setupButton;
     wxButton*           m_setupButton;

-    wxButton*           m_helpButton;
+//    wxButton*           m_helpButton;

     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;
     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;

-    wxCheckBox*         m_collateCopiesCheckBox;
-    
+//    wxCheckBox*         m_collateCopiesCheckBox;
+

     wxPrintDialogData   m_printDialogData;
     wxPrintDialogData   m_printDialogData;

-    
-    
+
+protected:
+    void Init(wxWindow *parent);
+
+private:

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)

 };
 
 };
 

-#define wxPRINTID_PRINTCOLOUR       10
-#define wxPRINTID_ORIENTATION       11
-#define wxPRINTID_COMMAND           12
-#define wxPRINTID_OPTIONS           13
-#define wxPRINTID_PAPERSIZE         14
-
-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)
     wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data);
     wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data);
 public:
     // There are no configuration options for the dialog, so we
     // just pass the wxPrintData object (no wxPrintSetupDialogData class needed)
     wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data);
     wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data);

-    ~wxGenericPrintSetupDialog();
+    virtual ~wxGenericPrintSetupDialog();

 
     void Init(wxPrintData* data);
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
 
     void Init(wxPrintData* data);
 
     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;
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;

-    inline wxPrintData& GetPrintData() { return m_printData; }
-#endif
-    
-};
+    wxPrintData&        GetPrintData() { return m_printData; }
+#endif // wxUSE_POSTSCRIPT

 
 

-#define wxPRINTID_LEFTMARGIN         30
-#define wxPRINTID_RIGHTMARGIN        31
-#define wxPRINTID_TOPMARGIN          32
-#define wxPRINTID_BOTTOMMARGIN       33
+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();
+    wxGenericPageSetupDialog(wxWindow *parent = NULL,
+                             wxPageSetupData* data = NULL);
+    virtual ~wxGenericPageSetupDialog();

 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     void OnPrinter(wxCommandEvent& event);
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     void OnPrinter(wxCommandEvent& event);

-    
-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
-    inline wxPageSetupData& GetPageSetupData() { return m_pageData; }
+
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);
+    wxPageSetupData& GetPageSetupData() { return m_pageData; }

 
 public:
     wxButton*       m_printerButton;
 
 public:
     wxButton*       m_printerButton;


@@ -151,14 +179,18 @@ 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;

-    
+

     wxPageSetupData m_pageData;
     wxPageSetupData m_pageData;

-    
+
+private:

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericPageSetupDialog)

 };
 
 };
 

+#endif
+

 #endif
 // __PRINTDLGH_G__
 #endif
 // __PRINTDLGH_G__