Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

[wxWidgets.git] / include / wx / msw / printdlg.h

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 06754215f34b5d88afa42d9c211fdbd3837eb888..2955b89b3cf251895918be96e3c24d7d5ae99a18 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printdlg.h
+// Name:        wx/msw/printdlg.h

 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -20,6 +19,7 @@
 #include "wx/printdlg.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 #include "wx/printdlg.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;

+class WinPrinter;

 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData


@@ -30,18 +30,19 @@ class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();

-    
+

     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 IsOk(); }
     virtual bool IsOk() const;
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;

-    
+
+    void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);

     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }

-   
+

 private:
     void* m_devMode;
     void* m_devNames;
 private:
     void* m_devMode;
     void* m_devNames;


@@ -51,7 +52,7 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };

-    
+

 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------


@@ -76,21 +77,21 @@ private:
     wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
     wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;

-    
+

 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );
 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );

-    
+

     // holds MSW handle
     void*             m_printDlg;
 
 private:
     // holds MSW handle
     void*             m_printDlg;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);

     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
 // ---------------------------------------------------------------------------
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
 // ---------------------------------------------------------------------------

-// wxWindowsPageSetupDialog: the MSW page setup dialog 
+// wxWindowsPageSetupDialog: the MSW page setup dialog

 // ---------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
 // ---------------------------------------------------------------------------
 
 class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase


@@ -105,12 +106,12 @@ public:
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 

-    virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; }
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }

 
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;
 
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;

-    
+

     // holds MSW handle
     void*                   m_pageDlg;
 
     // holds MSW handle
     void*                   m_pageDlg;