wxGTK/Univ compilation fixes

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

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 1aa9e22b6b4386a0472fad5f8851e5c32609aa59..6e1048917c52c379693deaeae089a70afa2ebf3d 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -110,7 +110,7 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
  * virtual function here as wxWidgets requires different ways to insert
  * a child in container classes. */
 
-static void wxInsertChildInPopupWin(wxWindow* parent, wxWindow* child)
+static void wxInsertChildInPopupWin(wxWindowGTK* parent, wxWindowGTK* child)
 {
     gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                    child->m_widget,

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 53a169c6c0f9ff8263b917a39638d79f0967c769..ccb4500d436d9297cd9514efcc6910a419979067 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3388,7 +3388,7 @@ bool wxWindowGTK::DoNavigateIn(int flags)
     }
     else // navigate inside the container
     {
-        wxWindow *parent = wxGetTopLevelParent(this);
+        wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
         wxCHECK_MSG( parent, false, _T("every window must have a TLW parent") );
 
         GtkDirectionType dir;