Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / src / os2 / print.cpp

diff --git a/src/os2/print.cpp b/src/os2/print.cpp
index dd82cee220ce17bd170e7b30ce8e8f49afcf226d..37908a98cf6c3ab26ddddb881a105047f07ef739 100644 (file)
--- a/src/os2/print.cpp
+++ b/src/os2/print.cpp
@@ -4,13 +4,14 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/list.h"


@@ -18,8 +19,6 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#if wxUSE_PRINTING_ARCHITECTURE
-

 #include "wx/os2/printos2.h"
 #include "wx/generic/prntdlgg.h"
 
 #include "wx/os2/printos2.h"
 #include "wx/generic/prntdlgg.h"
 


@@ -62,9 +61,6 @@ bool wxOS2Printer::Setup(wxWindow *WXUNUSED(parent))
 // TODO:
 /*
     wxPrintDialog dialog(parent, & m_printData);
 // TODO:
 /*
     wxPrintDialog dialog(parent, & m_printData);

-#if WXWIN_COMPATIBILITY_2_4
-    dialog.GetPrintData().SetSetupDialog(true);
-#endif

     return (dialog.ShowModal() == wxID_OK);
 */
     return false;
     return (dialog.ShowModal() == wxID_OK);
 */
     return false;