compilation fixes

[wxWidgets.git] / src / gtk1 / frame.cpp

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 096351342658fc64453979d6891e1f4c58eaf2a3..61259fad4b0f23497b45048703f53d0dbd49effd 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -152,19 +152,28 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
 // "configure_event"
 //-----------------------------------------------------------------------------
 
 // "configure_event"
 //-----------------------------------------------------------------------------
 

-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
+static gint 
+#if (GTK_MINOR_VERSON > 0)
+gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
+#else
+gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+#endif

 {
 {

-    if (g_isIdle)
+    if (g_isIdle) 

         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 

+#if (GTK_MINOR_VERSON > 0)

     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );
     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );

-

     win->m_x = x;
     win->m_y = y;
     win->m_x = x;
     win->m_y = y;

+#else
+    win->m_x = event->x;
+    win->m_y = event->y;
+#endif

 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );