correct access for virtuals

[wxWidgets.git] / src / gtk / window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index bf1f62fa1365240c85cbc87cadf1fe7ea5ab4ea4..b0b3fc5bf04c6d5d60505f9a0f34f9fa6703ae46 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -15,11 +15,17 @@
 #endif
 
 #include "wx/window.h"
 #endif
 
 #include "wx/window.h"

-#include "wx/dcclient.h"
-#include "wx/frame.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/dcclient.h"
+#endif
+

 #include "wx/layout.h"
 #include "wx/layout.h"

-#include "wx/utils.h"

 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
 #include "wx/module.h"


@@ -46,9 +52,7 @@
 
 #include "wx/menu.h"
 #include "wx/statusbr.h"
 
 #include "wx/menu.h"
 #include "wx/statusbr.h"

-#include "wx/intl.h"

 #include "wx/settings.h"
 #include "wx/settings.h"

-#include "wx/log.h"

 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__
 #include "wx/fontutil.h"
 
 #ifdef __WXDEBUG__


@@ -1587,6 +1591,10 @@ gtk_window_button_press_callback( GtkWidget *widget,
     if ( !g_captureWindow )
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
 
     if ( !g_captureWindow )
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
 

+    // reset the event object and id in case win changed.
+    event.SetEventObject( win );
+    event.SetId( win->GetId() );
+

     if (win->GetEventHandler()->ProcessEvent( event ))
     {
         g_signal_stop_emission_by_name (widget, "button_press_event");
     if (win->GetEventHandler()->ProcessEvent( event ))
     {
         g_signal_stop_emission_by_name (widget, "button_press_event");


@@ -1667,6 +1675,10 @@ gtk_window_button_release_callback( GtkWidget *widget,
     if ( !g_captureWindow )
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
 
     if ( !g_captureWindow )
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
 

+    // reset the event object and id in case win changed.
+    event.SetEventObject( win );
+    event.SetId( win->GetId() );
+

     if (win->GetEventHandler()->ProcessEvent( event ))
     {
         g_signal_stop_emission_by_name (widget, "button_release_event");
     if (win->GetEventHandler()->ProcessEvent( event ))
     {
         g_signal_stop_emission_by_name (widget, "button_release_event");


@@ -1742,6 +1754,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget,
     else // no capture
     {
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
     else // no capture
     {
         win = FindWindowForMouseEvent(win, event.m_x, event.m_y);

+
+        // reset the event object and id in case win changed.
+        event.SetEventObject( win );
+        event.SetId( win->GetId() );

     }
 
     if ( !g_captureWindow )
     }
 
     if ( !g_captureWindow )


@@ -1764,29 +1780,25 @@ gtk_window_motion_notify_callback( GtkWidget *widget,
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "mouse_wheel_event"
+// "scroll_event", (mouse wheel event)

 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean

-gtk_window_wheel_callback (GtkWidget * widget,
-                           GdkEventScroll * gdk_event,
-                           wxWindowGTK * win)
+window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)

 {
     DEBUG_MAIN_THREAD
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 
 {
     DEBUG_MAIN_THREAD
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    wxEventType event_type = wxEVT_NULL;
-    if (gdk_event->direction == GDK_SCROLL_UP)
-        event_type = wxEVT_MOUSEWHEEL;
-    else if (gdk_event->direction == GDK_SCROLL_DOWN)
-        event_type = wxEVT_MOUSEWHEEL;
-    else
-        return FALSE;
+    if (gdk_event->direction != GDK_SCROLL_UP &&
+        gdk_event->direction != GDK_SCROLL_DOWN)
+    {
+        return false;
+    }

 
 

-    wxMouseEvent event( event_type );
+    wxMouseEvent event(wxEVT_MOUSEWHEEL);

     // Can't use InitMouse macro because scroll events don't have button
     event.SetTimestamp( gdk_event->time );
     event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
     // Can't use InitMouse macro because scroll events don't have button
     event.SetTimestamp( gdk_event->time );
     event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);


@@ -1811,13 +1823,7 @@ gtk_window_wheel_callback (GtkWidget * widget,
     event.SetId( win->GetId() );
     event.SetTimestamp( gdk_event->time );
 
     event.SetId( win->GetId() );
     event.SetTimestamp( gdk_event->time );
 

-    if (win->GetEventHandler()->ProcessEvent( event ))
-    {
-        g_signal_stop_emission_by_name (widget, "scroll_event");
-        return TRUE;
-    }
-
-    return FALSE;
+    return win->GetEventHandler()->ProcessEvent(event);

 }
 }
 
 }
 }
 


@@ -2278,8 +2284,6 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    if (!win->m_hasScrolling) return;
-

     int client_width = 0;
     int client_height = 0;
     win->GetClientSize( &client_width, &client_height );
     int client_width = 0;
     int client_height = 0;
     win->GetClientSize( &client_width, &client_height );


@@ -2862,7 +2866,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
     g_signal_connect (widget, "scroll_event",
     g_signal_connect (widget, "motion_notify_event",
                       G_CALLBACK (gtk_window_motion_notify_callback), this);
     g_signal_connect (widget, "scroll_event",

-                      G_CALLBACK (gtk_window_wheel_callback), this);
+                      G_CALLBACK (window_scroll_event), this);

     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",
     g_signal_connect (widget, "popup_menu",
                      G_CALLBACK (wxgtk_window_popup_menu_callback), this);
     g_signal_connect (widget, "enter_notify_event",


@@ -4281,12 +4285,12 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
 {
     //RN: Note that static controls usually have no border on gtk, so maybe
 void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
 {
     //RN: Note that static controls usually have no border on gtk, so maybe

-    //it makes sense to treat that as simply no border at the wx level 
+    //it makes sense to treat that as simply no border at the wx level

     //as well...
     if (!(wxstyle & wxNO_BORDER) && !(wxstyle & wxBORDER_STATIC))
     {
         GtkShadowType gtkstyle;
     //as well...
     if (!(wxstyle & wxNO_BORDER) && !(wxstyle & wxBORDER_STATIC))
     {
         GtkShadowType gtkstyle;

-        
+

         if(wxstyle & wxBORDER_RAISED)
             gtkstyle = GTK_SHADOW_OUT;
         else if (wxstyle & wxBORDER_SUNKEN)
         if(wxstyle & wxBORDER_RAISED)
             gtkstyle = GTK_SHADOW_OUT;
         else if (wxstyle & wxBORDER_SUNKEN)


@@ -4296,7 +4300,7 @@ void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
         else //default
             gtkstyle = GTK_SHADOW_IN;
 
         else //default
             gtkstyle = GTK_SHADOW_IN;
 

-        gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(w), 
+        gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(w),

                                              gtkstyle );
     }
 }
                                              gtkstyle );
     }
 }