long -> wxCoord

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index c1ff0e8e86a4703c668568deff53a50dddef1949..c7e8bc5918d25beefa2a63af2996c6d65f6d02bf 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -301,7 +301,7 @@ static void draw_frame( GtkWidget *widget, wxWindow *win )
     int dw = 0;
     int dh = 0;
 
     int dw = 0;
     int dh = 0;
 

-    if (win->HasScrolling())
+    if (win->m_hasScrolling)

     {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
             
     {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
             


@@ -778,13 +778,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
          (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
     {
         wxNavigationKeyEvent new_event;
          (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
     {
         wxNavigationKeyEvent new_event;

-        new_event.SetEventObject( win );
+        new_event.SetEventObject( win->GetParent() );

         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
         new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
         new_event.SetCurrentFocus( win );
         /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
         new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
         new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
         new_event.SetCurrentFocus( win );

-        ret = win->GetEventHandler()->ProcessEvent( new_event );
+        ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event );

     }
 
     /* generate wxID_CANCEL if <esc> has been pressed (typically in dialogs) */
     }
 
     /* generate wxID_CANCEL if <esc> has been pressed (typically in dialogs) */


@@ -1581,6 +1581,7 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win )
 // "changed" from m_vAdjust
 //-----------------------------------------------------------------------------
 
 // "changed" from m_vAdjust
 //-----------------------------------------------------------------------------
 

+/*

 static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
 {
     DEBUG_MAIN_THREAD
 static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
 {
     DEBUG_MAIN_THREAD


@@ -1598,11 +1599,13 @@ static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }

+*/

 
 //-----------------------------------------------------------------------------
 // "changed" from m_hAdjust
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "changed" from m_hAdjust
 //-----------------------------------------------------------------------------
 

+/*

 static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
 {
     DEBUG_MAIN_THREAD
 static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
 {
     DEBUG_MAIN_THREAD


@@ -1620,26 +1623,23 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }

+*/

 
 //-----------------------------------------------------------------------------
 // "button_press_event" from scrollbar
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_press_event" from scrollbar
 //-----------------------------------------------------------------------------
 

-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
-                                                 GdkEventButton *WXUNUSED(gdk_event),
-                                                 wxWindow *win )
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,
+                                                 wxWindow *win)

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

-//  don't test here as we can release the mouse while being over
-//  a different window than the slider
-//
-//    if (gdk_event->window != widget->slider) return FALSE;
-
-    win->SetScrolling( TRUE );
+    g_blockEventsOnScroll = TRUE;
+    win->m_isScrolling = (gdk_event->window == widget->slider);

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -1648,20 +1648,45 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 // "button_release_event" from scrollbar
 //-----------------------------------------------------------------------------
 
 // "button_release_event" from scrollbar
 //-----------------------------------------------------------------------------
 

-static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+static gint gtk_scrollbar_button_release_callback( GtkRange *widget,

                                                    GdkEventButton *WXUNUSED(gdk_event),
                                                    GdkEventButton *WXUNUSED(gdk_event),

-                                                   wxWindow *win )
+                                                   wxWindow *win)

 {
     DEBUG_MAIN_THREAD
 
 {
     DEBUG_MAIN_THREAD
 

-

 //  don't test here as we can release the mouse while being over
 //  a different window than the slider
 //
 //    if (gdk_event->window != widget->slider) return FALSE;
 
 //  don't test here as we can release the mouse while being over
 //  a different window than the slider
 //
 //    if (gdk_event->window != widget->slider) return FALSE;
 

-    win->SetScrolling( FALSE );
+    g_blockEventsOnScroll = FALSE;

 
 

+    if (win->m_isScrolling)
+    {
+        wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
+        int value = -1;
+        int dir = -1;
+    
+        GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+        if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
+        {
+            value = (int)(win->m_hAdjust->value+0.5);
+            dir = wxHORIZONTAL;
+        }
+        if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
+        {
+            value = (int)(win->m_vAdjust->value+0.5);
+            dir = wxVERTICAL;
+        }
+        
+        wxScrollWinEvent event( command, value, dir );
+        event.SetScrolling( FALSE );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+
+    win->m_isScrolling = FALSE;
+    

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -1715,10 +1740,23 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
     if (g_isIdle)
         wxapp_install_idle_handler();
     
     if (g_isIdle)
         wxapp_install_idle_handler();
     

-#if wxUSE_CONSTRAINTS
-    if (win->GetAutoLayout())
-        win->Layout();
-#endif
+    if (!win->m_hasScrolling) return;
+    
+    int client_width = 0;
+    int client_height = 0;
+    win->GetClientSize( &client_width, &client_height );
+    if ((client_width == win->m_oldClientWidth) && (client_height == win->m_oldClientHeight))
+        return;
+        
+    win->m_oldClientWidth = client_width;
+    win->m_oldClientHeight = client_height;
+    
+    if (!win->m_nativeSizeEvent)
+    {
+        wxSizeEvent event( win->GetSize(), win->GetId() );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }

 }
 
 
 }
 
 


@@ -2081,10 +2119,12 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
     gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
           (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
 
     gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
           (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
 

+/*

     gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
           (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
     gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
           (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
     gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
           (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
     gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
           (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );

+*/

 
     gtk_widget_show( m_wxwindow );
 
 
     gtk_widget_show( m_wxwindow );
 


@@ -2346,6 +2386,11 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
                       m_height+border+bottom_border );
     }
 
                       m_height+border+bottom_border );
     }
 

+    if (m_hasScrolling)
+    {
+        GetClientSize( &m_oldClientWidth, &m_oldClientHeight );
+    }
+

 /*
     wxPrintf( "OnSize sent from " );
     if (GetClassInfo() && GetClassInfo()->GetClassName())
 /*
     wxPrintf( "OnSize sent from " );
     if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -2449,7 +2494,7 @@ void wxWindow::DoSetClientSize( int width, int height )
             dh += 1 * 2;
         }
 
             dh += 1 * 2;
         }
 

-        if (HasScrolling())
+        if (m_hasScrolling)

         {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             
         {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             


@@ -2511,7 +2556,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
             dh += 1 * 2;
         }
 
             dh += 1 * 2;
         }
 

-        if (HasScrolling())
+        if (m_hasScrolling)

         {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             
         {
             GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
             


@@ -2934,12 +2979,10 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedBackgroundColour = TRUE;
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedBackgroundColour = TRUE;

-
-        // pretend we have done something
-        return TRUE;

     }
 
     if ((m_wxwindow) &&
     }
 
     if ((m_wxwindow) &&

+        (m_wxwindow->window) &&

         (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
     {
         /* wxMSW doesn't clear the window here. I don't do that either to
         (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
     {
         /* wxMSW doesn't clear the window here. I don't do that either to


@@ -2977,9 +3020,6 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedForegroundColour = TRUE;
         // but it couldn't get applied as the
         // widget hasn't been realized yet.
         m_delayedForegroundColour = TRUE;

-
-        // pretend we have done something
-        return TRUE;

     }
 
     ApplyWidgetStyle();
     }
 
     ApplyWidgetStyle();


@@ -2989,15 +3029,24 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {

-    if (m_widgetStyle) return m_widgetStyle;
-
-    GtkStyle *def = gtk_rc_get_style( m_widget );
+    if (m_widgetStyle)
+    {
+        GtkStyle *remake = gtk_style_copy( m_widgetStyle );
+        remake->klass = m_widgetStyle->klass;
+        
+        gtk_style_unref( m_widgetStyle );
+        m_widgetStyle = remake;
+    }
+    else
+    {
+        GtkStyle *def = gtk_rc_get_style( m_widget );

 
 

-    if (!def)
-        def = gtk_widget_get_default_style();
+        if (!def)
+            def = gtk_widget_get_default_style();

 
 

-    m_widgetStyle = gtk_style_copy( def );
-    m_widgetStyle->klass = def->klass;
+        m_widgetStyle = gtk_style_copy( def );
+        m_widgetStyle->klass = def->klass;
+    }

 
     return m_widgetStyle;
 }
 
     return m_widgetStyle;
 }


@@ -3285,9 +3334,33 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
     }
 
     if (orient == wxHORIZONTAL)
     }
 
     if (orient == wxHORIZONTAL)

+    {
+/*
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
+            (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
+*/
+    

         gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
         gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );

+        
+/*
+        gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
+            (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
+*/
+    }

     else
     else

+    {
+/*
+        gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
+            (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
+*/
+

         gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
         gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );

+        
+/*
+        gtk_signal_connect( GTK_OBJECT(m_vAdjust), "changed",
+            (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
+*/
+    }

 }
 
 void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 }
 
 void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )


@@ -3317,20 +3390,29 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
         m_vAdjust->value = fpos;
     }
 
         m_vAdjust->value = fpos;
     }
 

-/*
-    if (!m_isScrolling)
+    if (m_wxwindow->window)

     {
     {

-*/
-        if (m_wxwindow->window)
+        if (orient == wxHORIZONTAL)

         {
         {

-            if (orient == wxHORIZONTAL)
-                gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-            else
-                gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
+                (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
+                
+            gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
+            
+            gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
+                (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
+        }
+        else
+        {
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
+                (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
+        
+            gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+
+            gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
+                (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );

         }
         }

-/*

     }
     }

-*/

 }
 
 int wxWindow::GetScrollThumb( int orient ) const
 }
 
 int wxWindow::GetScrollThumb( int orient ) const


@@ -3433,8 +3515,3 @@ void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
     }
 */
 }
     }
 */
 }

-
-void wxWindow::SetScrolling(bool scroll)
-{
-    m_isScrolling = g_blockEventsOnScroll = scroll;
-}