Merged some STC fixes over to the main branch

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

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index d6e1ee7922dd4a50d815713038494182dd9b13e9..81c60a30d499c161e5108e069b34723821e2072a 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -27,16 +27,16 @@
 #include "wx/dcprint.h"
 #include "math.h"
 
-#if !USE_SHARED_LIBRARY
+#if wxUSE_PRINTING_ARCHITECTURE
+
 IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
 
 
 // This form is deprecated
 wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
 {
-    LONG            lType;
-    HAB             hab;
+    LONG            lType = 0;
+    HAB             hab = 0;
     DEVOPENSTRUC    devOpen = { (char*)device_name.c_str()
                                ,(char*)driver_name.c_str()
                                ,NULL
@@ -284,7 +284,7 @@ static bool wxGetDefaultDeviceName(wxString& deviceName, wxString& portName)
 // Gets an HDC for the specified printer configuration
 WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
 {
-    HDC   hDC;
+    HDC   hDC = NULLHANDLE;
 /*
     wxPrintData printData = printDataConst;
     printData.ConvertToNative();
@@ -330,3 +330,4 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     return (WXHDC) hDC;
 }
 
+#endif //wxUSE_PRINTING_ARCHITECTURE