remove wxFindFocusedChild() declaration too as g++ gets upset if an extern function...

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

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 74f2a86790c986ac4f26d7bf374abd5ccfeacc40..79e3c9d0994a964e0407be0aed52f6d60f555c59 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -6,17 +6,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTDLGH_G_
 #define __PRINTDLGH_G_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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,23 +23,25 @@
 #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
 // ----------------------------------------------------------------------------
 

-// FIXME why all these enums start with 10 or 30?
+// This is not clear why all these enums start with 10 or 30 but do not change it
+// without good reason to avoid some subtle backwards compatibility breakage

 
 enum
 {
 
 enum
 {


@@ -85,12 +83,13 @@ class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase
 public:
     wxPostScriptPrintNativeData();
     virtual ~wxPostScriptPrintNativeData();
 public:
     wxPostScriptPrintNativeData();
     virtual ~wxPostScriptPrintNativeData();

-    
+

     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& GetPreviewCommand() const { return m_previewCommand; }
     const wxString& GetPrinterCommand() const { return m_printerCommand; }
     const wxString& GetPrinterOptions() const { return m_printerOptions; }
     const wxString& GetPreviewCommand() const { return m_previewCommand; }


@@ -128,11 +127,11 @@ private:
 #if wxUSE_STREAMS
     wxOutputStream *m_outputStream;
 #endif
 #if wxUSE_STREAMS
     wxOutputStream *m_outputStream;
 #endif

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData)
 };

-    
+

 // ----------------------------------------------------------------------------
 // Simulated Print and Print Setup dialogs for non-Windows platforms (and
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 // Simulated Print and Print Setup dialogs for non-Windows platforms (and
 // Windows using PostScript print/preview)


@@ -194,7 +193,7 @@ public:
     void Init(wxPrintData* data);
 
     void OnPrinter(wxListEvent& event);
     void Init(wxPrintData* data);
 
     void OnPrinter(wxListEvent& event);

-    
+

     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 


@@ -210,7 +209,7 @@ public:
 
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }

-    
+

     // After pressing OK, write data here.
     wxPrintData*        m_targetData;
 
     // After pressing OK, write data here.
     wxPrintData*        m_targetData;
 


@@ -221,20 +220,20 @@ private:
 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT
 

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

 {
 public:
     wxGenericPageSetupDialog(wxWindow *parent = NULL,
 {
 public:
     wxGenericPageSetupDialog(wxWindow *parent = NULL,

-                             wxPageSetupData* data = NULL);
+                             wxPageSetupDialogData* data = NULL);

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

-    void OnPrinter(wxCommandEvent& event);
+    virtual wxPageSetupDialogData& GetPageSetupDialogData();

 
 

+    void OnPrinter(wxCommandEvent& event);

     wxComboBox *CreatePaperTypeChoice(int* x, int* y);
     wxComboBox *CreatePaperTypeChoice(int* x, int* y);

-    wxPageSetupData& GetPageSetupData() { return m_pageData; }

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


@@ -245,9 +244,7 @@ public:
     wxTextCtrl*     m_marginBottomText;
     wxComboBox*       m_paperTypeChoice;
 
     wxTextCtrl*     m_marginBottomText;
     wxComboBox*       m_paperTypeChoice;
 

-    static bool     m_pageSetupDialogCancelled;
-
-    wxPageSetupData m_pageData;
+    wxPageSetupDialogData m_pageData;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -257,4 +254,4 @@ private:
 #endif
 
 #endif
 #endif
 
 #endif

-// __PRINTDLGH_G__
+// __PRINTDLGH_G_