Some wxOS2 compilation fixes after wxDC changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index a0761e7015c077295a926b33bb815460193ad34f..6e98cfadac79fff34cab5e628a6e0776c6494247 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -57,6 +57,9 @@
 #include "wx/mac/printdlg.h"
 #include "wx/mac/private/print.h"
 #include "wx/mac/dcprint.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcprint.h"
+#include "wx/generic/prntdlgg.h"
 #else
 #include "wx/generic/prntdlgg.h"
 #include "wx/dcps.h"

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 8a599bea4d0b7d7b78d141ed3f14c949053a4846..a565c74f17cdb6e586d80a8c3f917a3e098efb48 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -27,6 +27,7 @@
     #include "wx/image.h"
 #endif
 
+#include "wx/os2/dc.h"
 #include "wx/os2/private.h"
 
 #include "wx/xpmdecod.h"
@@ -928,9 +929,12 @@ wxImage wxBitmap::ConvertToImage() const
     //
     // May already be selected into a PS
     //
-    if ((pDC = GetSelectedInto()) != NULL)
+    pDC = GetSelectedInto();
+    const wxPMDCImpl *impl; 
+    if (pDC != NULL &&
+        (impl = wxDynamicCast( pDC->GetImpl(), wxPMDCImpl )) != NULL)
     {
-        hPSMem = pDC->GetHPS();
+        hPSMem = impl->GetHPS();
     }
     else
     {

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index 2b425b0e447883ac3abd3476c115f88ec0407549..0c53e236b9234cd18be7164ea879812b14db11b8 100644 (file)
--- a/src/os2/control.cpp
+++ b/src/os2/control.cpp
@@ -22,6 +22,7 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/os2/dc.h"
 #include "wx/os2/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
@@ -215,7 +216,8 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC    hWxDC,
 void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
 {
     RECTL                           vRect;
-    HPS                             hPS = rEvent.GetDC()->GetHPS();
+    wxPMDCImpl                     *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS                             hPS = impl->GetHPS();
     SIZEL                           vSize = {0,0};
 
     ::GpiSetPS(hPS, &vSize, PU_PELS | GPIF_DEFAULT);