missing commit

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index a9aa6021e9f51627f11c2a5d09803e26da7b530c..bce25d596799490bb87e3227917e555e2725360e 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -28,7 +28,7 @@ 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;
     if (eventType != wxEVT_NULL)
     {
         const int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;


@@ -38,14 +38,14 @@ gtk_value_changed(GtkRange* range, wxScrollBar* win)
         // first send the specific event for the user action
         wxScrollEvent evtSpec(eventType, id, value, orient);
         evtSpec.SetEventObject(win);
         // first send the specific event for the user action
         wxScrollEvent evtSpec(eventType, id, value, orient);
         evtSpec.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(evtSpec);
+        win->HandleWindowEvent(evtSpec);

 
         if (!win->m_isScrolling)
         {
             // and if it's over also send a general "changed" event
             wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
             evtChanged.SetEventObject(win);
 
         if (!win->m_isScrolling)
         {
             // and if it's over also send a general "changed" event
             wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
             evtChanged.SetEventObject(win);

-            win->GetEventHandler()->ProcessEvent(evtChanged);
+            win->HandleWindowEvent(evtChanged);

         }
     }
 }
         }
     }
 }


@@ -82,11 +82,11 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxScrollBar* win)
 
         wxScrollEvent evtRel(wxEVT_SCROLL_THUMBRELEASE, id, value, orient);
         evtRel.SetEventObject(win);
 
         wxScrollEvent evtRel(wxEVT_SCROLL_THUMBRELEASE, id, value, orient);
         evtRel.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(evtRel);
+        win->HandleWindowEvent(evtRel);

 
         wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
         evtChanged.SetEventObject(win);
 
         wxScrollEvent evtChanged(wxEVT_SCROLL_CHANGED, id, value, orient);
         evtChanged.SetEventObject(win);

-        win->GetEventHandler()->ProcessEvent(evtChanged);
+        win->HandleWindowEvent(evtChanged);

     }
 }
 }
     }
 }
 }


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

-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar,wxControl)
-

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


@@ -140,10 +138,8 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     }
 
     const bool isVertical = (style & wxSB_VERTICAL) != 0;
     }
 
     const bool isVertical = (style & wxSB_VERTICAL) != 0;

-    if (isVertical)
-        m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
-    else
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+    m_widget = gtk_scrollbar_new(GtkOrientation(isVertical), NULL);
+    g_object_ref(m_widget);

 
     m_scrollBar[0] = (GtkRange*)m_widget;
 
 
     m_scrollBar[0] = (GtkRange*)m_widget;
 


@@ -168,26 +164,25 @@ 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 )
 }
 
 void wxScrollBar::SetThumbPosition( int viewStart )


@@ -213,14 +208,13 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
         range =
         thumbSize = 1;
     }
         range =
         thumbSize = 1;
     }

-    GtkAdjustment* adj = ((GtkRange*)m_widget)->adjustment;
-    adj->step_increment = 1;
-    adj->page_increment = pageSize;
-    adj->page_size = thumbSize;
-    adj->value = position;

     g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);
     g_signal_handlers_block_by_func(m_widget, (void*)gtk_value_changed, this);

-    gtk_range_set_range((GtkRange*)m_widget, 0, range);
-    m_scrollPos[0] = adj->value;
+    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);
 }
 
     g_signal_handlers_unblock_by_func(m_widget, (void*)gtk_value_changed, this);
 }
 


@@ -234,16 +228,11 @@ void wxScrollBar::SetRange(int range)
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 
     SetScrollbar(GetThumbPosition(), GetThumbSize(), range, GetPageSize());
 }
 

-GdkWindow *wxScrollBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
-{
-    return m_widget->window;
-}
-

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

-    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL));

 }
 
 #endif // wxUSE_SCROLLBAR
 }
 
 #endif // wxUSE_SCROLLBAR