Updated list of subprojects.

[wxWidgets.git] / src / common / prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 13ddf2a44f1991733e200ce764baca8055680eb8..9bb2f18a2fe38f64c415a8e5de2bbcc3981ea239 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -21,6 +21,9 @@
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP
 #include "wx/dcprint.h"
 
 #ifndef WX_PRECOMP

+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW

     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dc.h"
     #include "wx/app.h"


@@ -34,12 +37,12 @@
     #include "wx/intl.h"
     #include "wx/textdlg.h"
     #include "wx/sizer.h"
     #include "wx/intl.h"
     #include "wx/textdlg.h"
     #include "wx/sizer.h"

+    #include "wx/module.h"

 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 #include "wx/print.h"
 #endif // !WX_PRECOMP
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 #include "wx/print.h"

-#include "wx/module.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -54,7 +57,6 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-    #include "wx/msw/wrapcdlg.h"

     #ifndef __WIN32__
         #include <print.h>
     #endif
     #ifndef __WIN32__
         #include <print.h>
     #endif


@@ -1369,7 +1371,7 @@ int wxPrintPreviewBase::GetMaxPage() const
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }
 { return m_maxPage; }
 int wxPrintPreviewBase::GetMinPage() const
 { return m_minPage; }

-bool wxPrintPreviewBase::Ok() const
+bool wxPrintPreviewBase::IsOk() const

 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }
 { return m_isOk; }
 void wxPrintPreviewBase::SetOk(bool ok)
 { m_isOk = ok; }


@@ -1497,7 +1499,7 @@ int wxPrintPreview::GetMinPage() const
     return m_pimpl->GetMinPage();
 }
 
     return m_pimpl->GetMinPage();
 }
 

-bool wxPrintPreview::Ok() const
+bool wxPrintPreview::IsOk() const

 {
     return m_pimpl->Ok();
 }
 {
     return m_pimpl->Ok();
 }