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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 81e73bdc1d7441464ac7933ae53391b0641a6a9e..ccb8237a04e672623bfdc2e28516087e92830f67 100644 (file)
--- 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?
 
 {
     if (show == m_fsIsShowing) return FALSE; // return what?
 


@@ -1241,7 +1241,7 @@ bool wxFrameGTK::IsIconized() const
     return m_isIconized;
 }
 
     return m_isIconized;
 }
 

-void wxFrame::SetIconizeState(bool iconize)
+void wxFrameGTK::SetIconizeState(bool iconize)

 {
     if ( iconize != m_isIconized )
     {
 {
     if ( iconize != m_isIconized )
     {

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 5c11a0acf3e45e1b8ae50869f9b7207b021147e7..e4d59dc1e804b844e5af0249a792fdad2ad67e7f 100644 (file)
--- 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
     }
 
     // we need to update the rect list as well

+#if OLDCODE

     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)
     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)


@@ -372,7 +373,7 @@ bool wxRegion::Intersect( const wxRegion& region )
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 81e73bdc1d7441464ac7933ae53391b0641a6a9e..ccb8237a04e672623bfdc2e28516087e92830f67 100644 (file)
--- 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?
 
 {
     if (show == m_fsIsShowing) return FALSE; // return what?
 


@@ -1241,7 +1241,7 @@ bool wxFrameGTK::IsIconized() const
     return m_isIconized;
 }
 
     return m_isIconized;
 }
 

-void wxFrame::SetIconizeState(bool iconize)
+void wxFrameGTK::SetIconizeState(bool iconize)

 {
     if ( iconize != m_isIconized )
     {
 {
     if ( iconize != m_isIconized )
     {

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 5c11a0acf3e45e1b8ae50869f9b7207b021147e7..e4d59dc1e804b844e5af0249a792fdad2ad67e7f 100644 (file)
--- 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
     }
 
     // we need to update the rect list as well

+#if OLDCODE

     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)
     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)


@@ -372,7 +373,7 @@ bool wxRegion::Intersect( const wxRegion& region )
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }