compilation fix for wxGTK1

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

diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp
index b3e03041015753400e052e1b7d1e75a59ac52b68..0551e88cc7fadde775af7e8bb4667f0f2e4603b5 100644 (file)
--- a/src/common/overlaycmn.cpp
+++ b/src/common/overlaycmn.cpp
@@ -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__)
      m_window = NULL ;
 {
 #if defined(__WXGTK__) || defined(__WXMSW__)
      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() ;
 }
 
 void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height )
 {
 {
     return m_bmpSaved.Ok() ;
 }
 
 void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height )
 {

-#if defined(__WXGTK__)
+#if defined(__WXGTK20__)

 #if wxUSE_NEW_DC
     wxImplDC *impl = dc->GetImpl();
     wxGTKWindowImplDC *gtk_impl = wxDynamicCast( impl, wxGTKWindowImplDC );
 #if wxUSE_NEW_DC
     wxImplDC *impl = dc->GetImpl();
     wxGTKWindowImplDC *gtk_impl = wxDynamicCast( impl, wxGTKWindowImplDC );


@@ -155,11 +155,10 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
 #else
     m_window = dc->m_owningWindow;
 #endif
 #else
     m_window = dc->m_owningWindow;
 #endif

-#else
-    #if defined (__WXMSW__) 
+#elif defined(__WXGTK__)
+    m_window = dc->m_owner;
+#elif defined(__WXMSW__)

     m_window = dc->GetWindow();
     m_window = dc->GetWindow();

-    #endif  // __WXMSW__
-   

 #endif
     wxMemoryDC dcMem ;
     m_bmpSaved.Create( width, height );
 #endif
     wxMemoryDC dcMem ;
     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 ;
     dcMem.SelectObject( m_bmpSaved );
 {
     wxMemoryDC dcMem ;
     dcMem.SelectObject( m_bmpSaved );