Fix a number of mingw compile errors.

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 1c183e6a4d3c4734725ec536f1149431ecfc2fc3..2ef064b3facb2fb65069cbcc6c2463150f2da38d 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -28,19 +28,24 @@ extern "C" {
 static void
 gtk_value_changed(GtkRange* range, wxScrollBar* win)
 {
 static void
 gtk_value_changed(GtkRange* range, wxScrollBar* win)
 {

-    wxEventType eventType = win->GetScrollEventType(range);
+    wxEventType eventType = win->GTKGetScrollEventType(range);

     if (eventType != wxEVT_NULL)
     {
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
         const int value = win->GetThumbPosition();
     if (eventType != wxEVT_NULL)
     {
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
         const int value = win->GetThumbPosition();

-        wxScrollEvent event(eventType, win->GetId(), value, orient);
-        event.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(event);
+        const int id = win->GetId();
+
+        // first send the specific event for the user action
+        wxScrollEvent evtSpec(eventType, id, value, orient);
+        evtSpec.SetEventObject(win);
+        win->HandleWindowEvent(evtSpec);
+

         if (!win->m_isScrolling)
         {
         if (!win->m_isScrolling)
         {

-            wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
-            event.SetEventObject(win);
-            win->GetEventHandler()->ProcessEvent(event);
+            // and if it's over also send a general "changed" event
+            wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
+            evtChanged.SetEventObject(win);
+            win->HandleWindowEvent(evtChanged);

         }
     }
 }
         }
     }
 }


@@ -54,39 +59,55 @@ extern "C" {
 static gboolean
 gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 {
 static gboolean
 gtk_button_press_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     win->m_mouseButtonDown = true;
     return false;
 }
 }
 
     win->m_mouseButtonDown = true;
     return false;
 }
 }
 

+//-----------------------------------------------------------------------------
+// "event_after" from scrollbar
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)
+{
+    if (event->type == GDK_BUTTON_RELEASE)
+    {
+        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);
+
+        const int value = win->GetThumbPosition();
+        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        const int id = win->GetId();
+
+        wxScrollEvent evtRel(wxEVT_SCROLL_THUMBRELEASE, id, value, orient);
+        evtRel.SetEventObject(win);
+        win->HandleWindowEvent(evtRel);
+
+        wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
+        evtChanged.SetEventObject(win);
+        win->HandleWindowEvent(evtChanged);
+    }
+}
+}
+

 //-----------------------------------------------------------------------------
 // "button_release_event" from scrollbar
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean
 //-----------------------------------------------------------------------------
 // "button_release_event" from scrollbar
 //-----------------------------------------------------------------------------
 
 extern "C" {
 static gboolean

-gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
+gtk_button_release_event(GtkRange* range, GdkEventButton*, wxScrollBar* win)

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     win->m_mouseButtonDown = false;
     // If thumb tracking
     if (win->m_isScrolling)
     {
         win->m_isScrolling = false;
     win->m_mouseButtonDown = false;
     // If thumb tracking
     if (win->m_isScrolling)
     {
         win->m_isScrolling = false;

-        const int value = win->GetThumbPosition();
-        const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
-
-        wxScrollEvent event(wxEVT_SCROLL_THUMBRELEASE, win->GetId(), value, orient);
-        event.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(event);
-
-        wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
-        event2.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(event2);
+        // Hook up handler to send thumb release event after this emission is finished.
+        // To allow setting scroll position from event handler, sending event must
+        // be deferred until after the GtkRange handler for this signal has run
+        g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win);

     }
 
     return false;
     }
 
     return false;


@@ -97,8 +118,6 @@ gtk_button_release_event(GtkRange*, GdkEventButton*, wxScrollBar* win)
 // wxScrollBar
 //-----------------------------------------------------------------------------
 
 // wxScrollBar
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-

 wxScrollBar::wxScrollBar()
 {
 }
 wxScrollBar::wxScrollBar()
 {
 }


@@ -111,9 +130,6 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -123,19 +139,25 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     const bool isVertical = (style & wxSB_VERTICAL) != 0;
     if (isVertical)
 
     const bool isVertical = (style & wxSB_VERTICAL) != 0;
     if (isVertical)

-        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_vscrollbar_new( NULL );

     else
     else

-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_hscrollbar_new( NULL );
+    g_object_ref(m_widget);

 
 

-    m_scrollBar[int(isVertical)] = (GtkRange*)m_widget;
+    m_scrollBar[0] = (GtkRange*)m_widget;

 
 

-    g_signal_connect(m_widget, "value_changed",
+    g_signal_connect_after(m_widget, "value_changed",

                      G_CALLBACK(gtk_value_changed), this);
     g_signal_connect(m_widget, "button_press_event",
                      G_CALLBACK(gtk_button_press_event), this);
     g_signal_connect(m_widget, "button_release_event",
                      G_CALLBACK(gtk_button_release_event), this);
 
                      G_CALLBACK(gtk_value_changed), this);
     g_signal_connect(m_widget, "button_press_event",
                      G_CALLBACK(gtk_button_press_event), this);
     g_signal_connect(m_widget, "button_release_event",
                      G_CALLBACK(gtk_button_release_event), this);
 

+    gulong handler_id;
+    handler_id = g_signal_connect(
+        m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+    g_signal_handler_block(m_widget, handler_id);
+

     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);


@@ -145,53 +167,58 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
 int wxScrollBar::GetThumbPosition() const
 {
 
 int wxScrollBar::GetThumbPosition() const
 {

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    return int(adj->value + 0.5);
+    return wxRound(gtk_range_get_value(GTK_RANGE(m_widget)));

 }
 
 int wxScrollBar::GetThumbSize() const
 {
 }
 
 int wxScrollBar::GetThumbSize() const
 {

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    return int(adj->page_size);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_page_size(adj));

 }
 
 int wxScrollBar::GetPageSize() const
 {
 }
 
 int wxScrollBar::GetPageSize() const
 {

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    return int(adj->page_increment);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_page_increment(adj));

 }
 
 int wxScrollBar::GetRange() const
 {
 }
 
 int wxScrollBar::GetRange() const
 {

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    return int(adj->upper);
+    GtkAdjustment* adj = gtk_range_get_adjustment(GTK_RANGE(m_widget));
+    return int(gtk_adjustment_get_upper(adj));

 }
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (GetThumbPosition() != viewStart)
     {
 }
 
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (GetThumbPosition() != viewStart)
     {

-        BlockScrollEvent();
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);
+

         gtk_range_set_value((GtkRange*)m_widget, viewStart);
         gtk_range_set_value((GtkRange*)m_widget, viewStart);

-        UnblockScrollEvent();
-        GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-        const int i = HasFlag(wxSB_VERTICAL);
-        m_scrollPos[i] = adj->value;
+        m_scrollPos[0] = gtk_range_get_value((GtkRange*)m_widget);
+
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtk_value_changed, this);

     }
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)
 {
     }
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize, bool)
 {

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    adj->value = position;
-    adj->step_increment = 1;
-    adj->page_increment = pageSize;
-    adj->page_size = thumbSize;
-    BlockScrollEvent();
-    gtk_range_set_range((GtkRange*)m_widget, 0, range);
-    UnblockScrollEvent();
-    const int i = HasFlag(wxSB_VERTICAL);
-    m_scrollPos[i] = adj->value;
+    if (range == 0)
+    {
+        // GtkRange requires upper > lower
+        range =
+        thumbSize = 1;
+    }
+    g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);
+    GtkRange* widget = GTK_RANGE(m_widget);
+    gtk_adjustment_set_page_size(gtk_range_get_adjustment(widget), thumbSize);
+    gtk_range_set_increments(widget, 1, pageSize);
+    gtk_range_set_range(widget, 0, range);
+    gtk_range_set_value(widget, position);
+    m_scrollPos[0] = gtk_range_get_value(widget);
+    g_signal_handlers_unblock_by_func(m_widget, (void*)gtk_value_changed, this);

 }
 
 void wxScrollBar::SetPageSize( int pageLength )
 }
 
 void wxScrollBar::SetPageSize( int pageLength )


@@ -204,12 +231,6 @@ void wxScrollBar::SetRange(int range)
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 

-bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
-{
-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) );
-}
-

 // static
 wxVisualAttributes
 wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))