Fixed OS/2 compilation problems.

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index be7cf5c5e4081f825d3ea999410d5d4090c3707e..097ea5403fc7e63938137163ca8e5402fadad7e5 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -7,147 +7,190 @@
 // 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_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 #ifdef __GNUG__

-#pragma interface "prntdlgg.h"
+    #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/dialog.h"
 
 #if wxUSE_POSTSCRIPT
 #include "wx/dialog.h"
 
 #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;
 

-/*
- * Simulated Print and Print Setup dialogs
- * for non-Windows platforms (and Windows using PostScript print/preview)
- */
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// FIXME why all these enums start with 10 or 30?

 
 

-#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_STATIC = 10,
+    wxPRINTID_RANGE,
+    wxPRINTID_FROM,
+    wxPRINTID_TO,
+    wxPRINTID_COPIES,
+    wxPRINTID_PRINTTOFILE,
+    wxPRINTID_SETUP
+};

 
 

-class WXDLLEXPORT wxGenericPrintDialog: public wxDialog
+enum

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
+    wxPRINTID_LEFTMARGIN = 30,
+    wxPRINTID_RIGHTMARGIN,
+    wxPRINTID_TOPMARGIN,
+    wxPRINTID_BOTTOMMARGIN
+};

 
 

- public:
-  wxStaticText  *printerMessage;
-  wxButton   *setupButton;
-  wxButton   *helpButton;
-  wxRadioBox *rangeRadioBox;
-  wxTextCtrl     *fromText;
-  wxTextCtrl     *toText;
-  wxTextCtrl     *noCopiesText;
-  wxCheckBox *printToFileCheckBox;
-  wxCheckBox *collateCopiesCheckBox;
+enum
+{
+    wxPRINTID_PRINTCOLOUR = 10,
+    wxPRINTID_ORIENTATION,
+    wxPRINTID_COMMAND,
+    wxPRINTID_OPTIONS,
+    wxPRINTID_PAPERSIZE
+};

 
 

-  wxPrintData printData;
-  wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);
-  ~wxGenericPrintDialog(void);
+// ----------------------------------------------------------------------------
+// Simulated Print and Print Setup dialogs for non-Windows platforms (and
+// Windows using PostScript print/preview)
+// ----------------------------------------------------------------------------

 
 

-  void OnSetup(wxCommandEvent& event);
-  void OnRange(wxCommandEvent& event);
-  void OnOK(wxCommandEvent& event);
+#if wxUSE_POSTSCRIPT
+class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
+{
+    DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)

 
 

-  virtual bool TransferDataFromWindow(void);
-  virtual bool TransferDataToWindow(void);
+public:
+    wxGenericPrintDialog(wxWindow *parent,
+                         wxPrintDialogData* data = (wxPrintDialogData*)NULL);
+    wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);

 
 

-  virtual int ShowModal(void);
+    virtual ~wxGenericPrintDialog();

 
 

-  inline wxPrintData& GetPrintData(void) { return printData; }
-  wxDC *GetPrintDC(void);
+    void OnSetup(wxCommandEvent& event);
+    void OnRange(wxCommandEvent& event);
+    void OnOK(wxCommandEvent& event);

 
 

-DECLARE_EVENT_TABLE()
-};
+    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataToWindow();

 
 

-#define wxPRINTID_PRINTCOLOUR       10
-#define wxPRINTID_ORIENTATION       11
-#define wxPRINTID_COMMAND           12
-#define wxPRINTID_OPTIONS           13
-#define wxPRINTID_PAPERSIZE         14
+    virtual int ShowModal();

 
 

-class WXDLLEXPORT wxGenericPrintSetupDialog: public wxDialog
+#if wxUSE_POSTSCRIPT
+    wxPrintData& GetPrintData()
+        { return m_printDialogData.GetPrintData(); }
+#endif // wxUSE_POSTSCRIPT
+
+    wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+    wxDC *GetPrintDC();
+
+public:
+//    wxStaticText*       m_printerMessage;
+    wxButton*           m_setupButton;
+//    wxButton*           m_helpButton;
+    wxRadioBox*         m_rangeRadioBox;
+    wxTextCtrl*         m_fromText;
+    wxTextCtrl*         m_toText;
+    wxTextCtrl*         m_noCopiesText;
+    wxCheckBox*         m_printToFileCheckBox;
+//    wxCheckBox*         m_collateCopiesCheckBox;
+
+    wxPrintDialogData   m_printDialogData;
+
+protected:
+    void Init(wxWindow *parent);
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog

 {
 {

-  DECLARE_CLASS(wxGenericPrintSetupDialog)
+    DECLARE_CLASS(wxGenericPrintSetupDialog)

 
 

- public:
-  wxRadioBox *orientationRadioBox;
-  wxTextCtrl     *printerCommandText;
-  wxTextCtrl     *printerOptionsText;
-  wxCheckBox *colourCheckBox;
-  wxChoice   *paperTypeChoice;
+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);
+    virtual ~wxGenericPrintSetupDialog();

 
 

-#if wxUSE_POSTSCRIPT
-  wxPrintSetupData printData;
-  inline wxPrintSetupData& GetPrintData(void) { return printData; }
-#endif
+    void Init(wxPrintData* data);

 
 

-  wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data);
-  ~wxGenericPrintSetupDialog(void);
+    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataToWindow();

 
 

-  virtual bool TransferDataFromWindow(void);
-  virtual bool TransferDataToWindow(void);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

 
 

-  wxChoice *CreatePaperTypeChoice(int* x, int* y);
-};
+public:
+    wxRadioBox*         m_orientationRadioBox;
+    wxTextCtrl*         m_printerCommandText;
+    wxTextCtrl*         m_printerOptionsText;
+    wxCheckBox*         m_colourCheckBox;
+    wxComboBox*           m_paperTypeChoice;

 
 

-#define wxPRINTID_LEFTMARGIN         30
-#define wxPRINTID_RIGHTMARGIN        31
-#define wxPRINTID_TOPMARGIN          32
-#define wxPRINTID_BOTTOMMARGIN       33
+#if wxUSE_POSTSCRIPT
+    wxPrintData         m_printData;
+    wxPrintData&        GetPrintData() { return m_printData; }
+#endif // wxUSE_POSTSCRIPT
+};
+#endif
+    // wxUSE_POSTSCRIPT

 
 

-class WXDLLEXPORT wxGenericPageSetupDialog: public wxDialog
+class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog

 {
 {

-  DECLARE_CLASS(wxGenericPageSetupDialog)
+    DECLARE_CLASS(wxGenericPageSetupDialog)
+
+public:
+    wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
+    virtual ~wxGenericPageSetupDialog();

 
 

- public:
-  wxButton   *printerButton;
-  wxRadioBox *orientationRadioBox;
-  wxTextCtrl     *marginLeftText;
-  wxTextCtrl     *marginTopText;
-  wxTextCtrl     *marginRightText;
-  wxTextCtrl     *marginBottomText;
-  wxChoice   *paperTypeChoice;
+    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataToWindow();

 
 

-  static bool pageSetupDialogCancelled;
-  
-  wxPageSetupData pageData;
+    void OnPrinter(wxCommandEvent& event);

 
 

-  wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL);
-  ~wxGenericPageSetupDialog(void);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);
+    wxPageSetupData& GetPageSetupData() { return m_pageData; }

 
 

-  virtual bool TransferDataFromWindow(void);
-  virtual bool TransferDataToWindow(void);
+public:
+    wxButton*       m_printerButton;
+    wxRadioBox*     m_orientationRadioBox;
+    wxTextCtrl*     m_marginLeftText;
+    wxTextCtrl*     m_marginTopText;
+    wxTextCtrl*     m_marginRightText;
+    wxTextCtrl*     m_marginBottomText;
+    wxComboBox*       m_paperTypeChoice;

 
 

-  void OnPrinter(wxCommandEvent& event);
+    static bool     m_pageSetupDialogCancelled;

 
 

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

 
 

-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

-    // __PRINTDLGH_G__
+
+#endif
+// __PRINTDLGH_G__