wxPython 2.7.1.1

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

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 87c745f2e8a7f1c69baa708abb0f1b469f7a68ea..e71b9dc084f2c27935d15bc29d88fdd6980bd137 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -12,23 +12,24 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/dcprint.h"
+

 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
 #ifndef WX_PRECOMP
 #define INCL_DEV
 #define INCL_GPI
 #define INCL_PM
 #include<os2.h>
 
 #ifndef WX_PRECOMP

-#include "wx/app.h"
-#include "wx/math.h"
+    #include "wx/app.h"
+    #include "wx/math.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/string.h"
-#include "wx/log.h"
-#include "wx/window.h"

 #include "wx/os2/private.h"
 #include "wx/os2/private.h"

-#include "wx/dcprint.h"
-
-#if wxUSE_PRINTING_ARCHITECTURE

 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 


@@ -277,7 +278,7 @@ static bool wxGetDefaultDeviceName( wxString& rsDeviceName, wxString& rsPortName
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }
         GlobalFree(pd.hDevMode);
         pd.hDevMode=NULL;
     }

-    return ( deviceName != wxT("") );
+    return !deviceName.empty();

 */
     return true;
 } // end of wxGetDefaultDeviceName
 */
     return true;
 } // end of wxGetDefaultDeviceName