From 2a365b7d3f8598b0c7d98a150c47f0211d27437e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 28 Jun 2001 16:49:17 +0000 Subject: [PATCH] Fixed some compilos. Things that still need fixing incl. logg.cpp compilation and docvwmdi debugging git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/frame.cpp | 4 ++-- src/gtk/region.cpp | 3 ++- src/gtk1/frame.cpp | 4 ++-- src/gtk1/region.cpp | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 81e73bdc1d..ccb8237a04 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -603,7 +603,7 @@ wxFrameGTK::~wxFrameGTK() } } -bool wxFrame::ShowFullScreen(bool show, long style ) +bool wxFrameGTK::ShowFullScreen(bool show, long style ) { if (show == m_fsIsShowing) return FALSE; // return what? @@ -1241,7 +1241,7 @@ bool wxFrameGTK::IsIconized() const return m_isIconized; } -void wxFrame::SetIconizeState(bool iconize) +void wxFrameGTK::SetIconizeState(bool iconize) { if ( iconize != m_isIconized ) { diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 5c11a0acf3..e4d59dc1e8 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -351,6 +351,7 @@ bool wxRegion::Intersect( const wxRegion& region ) } // we need to update the rect list as well +#if OLDCODE wxList& list = *GetRectList(); wxNode *node = list.First(); while (node) @@ -372,7 +373,7 @@ bool wxRegion::Intersect( const wxRegion& region ) node = node->Next(); } - +#endif return TRUE; } diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 81e73bdc1d..ccb8237a04 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -603,7 +603,7 @@ wxFrameGTK::~wxFrameGTK() } } -bool wxFrame::ShowFullScreen(bool show, long style ) +bool wxFrameGTK::ShowFullScreen(bool show, long style ) { if (show == m_fsIsShowing) return FALSE; // return what? @@ -1241,7 +1241,7 @@ bool wxFrameGTK::IsIconized() const return m_isIconized; } -void wxFrame::SetIconizeState(bool iconize) +void wxFrameGTK::SetIconizeState(bool iconize) { if ( iconize != m_isIconized ) { diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp index 5c11a0acf3..e4d59dc1e8 100644 --- a/src/gtk1/region.cpp +++ b/src/gtk1/region.cpp @@ -351,6 +351,7 @@ bool wxRegion::Intersect( const wxRegion& region ) } // we need to update the rect list as well +#if OLDCODE wxList& list = *GetRectList(); wxNode *node = list.First(); while (node) @@ -372,7 +373,7 @@ bool wxRegion::Intersect( const wxRegion& region ) node = node->Next(); } - +#endif return TRUE; } -- 2.45.2