Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some wxOS2 compilation fixes after wxDC changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-12 18:30:14 +00:00
parent 2a818b7a73
commit 7c71eb6a26
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/prntbase.cpp
View File

@@ -57,6 +57,9 @@
#include "wx/mac/printdlg.h" #include "wx/mac/printdlg.h"
#include "wx/mac/private/print.h" #include "wx/mac/private/print.h"
#include "wx/mac/dcprint.h" #include "wx/mac/dcprint.h"
#elif defined(__WXPM__)
#include "wx/os2/dcprint.h"
#include "wx/generic/prntdlgg.h"
#else #else
#include "wx/generic/prntdlgg.h" #include "wx/generic/prntdlgg.h"
#include "wx/dcps.h" #include "wx/dcps.h"

8
src/os2/bitmap.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/image.h" #include "wx/image.h"
#endif #endif
#include "wx/os2/dc.h"
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include "wx/xpmdecod.h" #include "wx/xpmdecod.h"
@@ -928,9 +929,12 @@ wxImage wxBitmap::ConvertToImage() const
// //
// May already be selected into a PS // 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 else
{ {

4
src/os2/control.cpp
View File

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