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

compilation fix for wxGTK1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-26 12:17:01 +00:00
parent bff023f172
commit 5abbb704ba
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/overlaycmn.cpp
View File

@@ -116,7 +116,7 @@ void wxDCOverlay::Init(wxWindowDC *dc, int x , int y , int width , int height )
m_overlay.BeginDrawing(dc); m_overlay.BeginDrawing(dc);
} }
void wxDCOverlay::Clear() void wxDCOverlay::Clear()
{ {
m_overlay.Clear(m_dc); m_overlay.Clear(m_dc);
} }
@@ -131,7 +131,7 @@ wxOverlayImpl::wxOverlayImpl()
{ {
#if defined(__WXGTK__) || defined(__WXMSW__) #if defined(__WXGTK__) || defined(__WXMSW__)
m_window = NULL ; m_window = NULL ;
#endif #endif
m_x = m_y = m_width = m_height = 0 ; m_x = m_y = m_width = m_height = 0 ;
} }
@@ -139,14 +139,14 @@ wxOverlayImpl::~wxOverlayImpl()
{ {
} }
bool wxOverlayImpl::IsOk() bool wxOverlayImpl::IsOk()
{ {
return m_bmpSaved.Ok() ; return m_bmpSaved.Ok() ;
} }
void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height ) void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height )
{ {
#if defined(__WXGTK__) #if defined(__WXGTK20__)
#if wxUSE_NEW_DC #if wxUSE_NEW_DC
wxImplDC *impl = dc->GetImpl(); wxImplDC *impl = dc->GetImpl();
wxGTKWindowImplDC *gtk_impl = wxDynamicCast( impl, wxGTKWindowImplDC ); wxGTKWindowImplDC *gtk_impl = wxDynamicCast( impl, wxGTKWindowImplDC );
@@ -155,11 +155,10 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
#else #else
m_window = dc->m_owningWindow; m_window = dc->m_owningWindow;
#endif #endif
#else #elif defined(__WXGTK__)
#if defined (__WXMSW__) m_window = dc->m_owner;
#elif defined(__WXMSW__)
m_window = dc->GetWindow(); m_window = dc->GetWindow();
#endif // __WXMSW__
#endif #endif
wxMemoryDC dcMem ; wxMemoryDC dcMem ;
m_bmpSaved.Create( width, height ); m_bmpSaved.Create( width, height );
@@ -178,7 +177,7 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
dcMem.SelectObject( wxNullBitmap ); dcMem.SelectObject( wxNullBitmap );
} }
void wxOverlayImpl::Clear(wxWindowDC* dc) void wxOverlayImpl::Clear(wxWindowDC* dc)
{ {
wxMemoryDC dcMem ; wxMemoryDC dcMem ;
dcMem.SelectObject( m_bmpSaved ); dcMem.SelectObject( m_bmpSaved );