Make Univ/GTK compile again

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index ee320bc684c25da26d2b04f17bedc1d814007714..534759fca72e488ae3bfdf05fba230ba484c4375 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -761,7 +761,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {

-        if ( g_delayedFocus && wxGetTopLevelParent(g_delayedFocus) == this )
+        if ( g_delayedFocus &&
+             wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )

         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;
         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 4630c80600a237a5d655d888fa43c0fdba8536a0..bad1ac7648dc2979e3853ff25e6360699017729e 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus()
         }
     }
 
         }
     }
 

-    (void)DoSendFocusEvents(this);
+    (void)DoSendFocusEvents((wxWindow*)this);

 }
 
 bool wxWindowGTK::AcceptsFocus() const
 }
 
 bool wxWindowGTK::AcceptsFocus() const


@@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents()
         while (parent && !parent->IsTopLevel())
             parent = parent->GetParent();
         if (!parent)
         while (parent && !parent->IsTopLevel())
             parent = parent->GetParent();
         if (!parent)

-            parent = this;
+            parent = (wxWindow*)this;

     
         wxRegionIterator upd( m_updateRegion );
         while (upd)
     
         wxRegionIterator upd( m_updateRegion );
         while (upd)

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index ee320bc684c25da26d2b04f17bedc1d814007714..534759fca72e488ae3bfdf05fba230ba484c4375 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -761,7 +761,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {

-        if ( g_delayedFocus && wxGetTopLevelParent(g_delayedFocus) == this )
+        if ( g_delayedFocus &&
+             wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )

         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;
         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 4630c80600a237a5d655d888fa43c0fdba8536a0..bad1ac7648dc2979e3853ff25e6360699017729e 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus()
         }
     }
 
         }
     }
 

-    (void)DoSendFocusEvents(this);
+    (void)DoSendFocusEvents((wxWindow*)this);

 }
 
 bool wxWindowGTK::AcceptsFocus() const
 }
 
 bool wxWindowGTK::AcceptsFocus() const


@@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents()
         while (parent && !parent->IsTopLevel())
             parent = parent->GetParent();
         if (!parent)
         while (parent && !parent->IsTopLevel())
             parent = parent->GetParent();
         if (!parent)

-            parent = this;
+            parent = (wxWindow*)this;

     
         wxRegionIterator upd( m_updateRegion );
         while (upd)
     
         wxRegionIterator upd( m_updateRegion );
         while (upd)