call Show(false) from ~wxDialog to call EndModal if the dialog is still modal consist...

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 3eaaba17d7dc4fe9d6c57e67b60a2be8ac2ffafa..f14ae6394ae551c4ed25c47bdd6eb9b95f7b64bc 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -12,18 +12,14 @@
 
 #if wxUSE_SLIDER
 
 
 #if wxUSE_SLIDER
 

-#ifdef __VMS
-   //Missing definition in OpenVMS C++ header files.
-   double round(double __x);
-#endif
-

 #include "wx/slider.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 #include "wx/slider.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -50,7 +46,7 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     {
         wxScrollEvent event( evtType, win->GetId(), value, orient );
         event.SetEventObject( win );
     {
         wxScrollEvent event( evtType, win->GetId(), value, orient );
         event.SetEventObject( win );

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

     }
 
     // but, in any case, except if we're dragging the slider (and so the change
     }
 
     // but, in any case, except if we're dragging the slider (and so the change


@@ -59,14 +55,14 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     {
         wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event.SetEventObject( win );
     {
         wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event.SetEventObject( win );

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

     }
 
     // and also generate a command event for compatibility
     wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     event.SetEventObject( win );
     event.SetInt( value );
     }
 
     // and also generate a command event for compatibility
     wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     event.SetEventObject( win );
     event.SetInt( value );

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

 }
 
 static inline wxEventType GtkScrollTypeToWx(int scrollType)
 }
 
 static inline wxEventType GtkScrollTypeToWx(int scrollType)


@@ -128,15 +124,14 @@ extern "C" {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {
 static void
 gtk_value_changed(GtkRange* range, wxSlider* win)
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    GtkAdjustment* adj = range->adjustment;
-    const int pos = int(round(adj->value));
+    GtkAdjustment* adj = gtk_range_get_adjustment (range);
+    const int pos = wxRound(adj->value);

     const double oldPos = win->m_pos;
     win->m_pos = adj->value;
     const double oldPos = win->m_pos;
     win->m_pos = adj->value;

+
+    if (!win->m_hasVMT || g_blockEventsOnDrag)
+        return;
+

     if (win->m_blockScrollEvent)
     {
         win->m_scrollEventType = GTK_SCROLL_NONE;
     if (win->m_blockScrollEvent)
     {
         win->m_scrollEventType = GTK_SCROLL_NONE;


@@ -183,9 +178,8 @@ gtk_value_changed(GtkRange* range, wxSlider* win)
     win->m_scrollEventType = GTK_SCROLL_NONE;
 
     // If integral position has changed
     win->m_scrollEventType = GTK_SCROLL_NONE;
 
     // If integral position has changed

-    if (int(round(oldPos)) != pos)
+    if (wxRound(oldPos) != pos)

     {
     {

-        wxCHECK_RET(eventType != wxEVT_NULL, _T("Unknown slider scroll event type"));

         ProcessScrollEvent(win, eventType);
         win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
     }
         ProcessScrollEvent(win, eventType);
         win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
     }


@@ -229,7 +223,7 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win)
 {
     if (event->type == GDK_BUTTON_RELEASE)
     {
 {
     if (event->type == GDK_BUTTON_RELEASE)
     {

-        g_signal_handlers_block_by_func(range, (void*)gtk_event_after, win);
+        g_signal_handlers_block_by_func(range, (gpointer) gtk_event_after, win);

 
         if (win->m_needThumbRelease)
         {
 
         if (win->m_needThumbRelease)
         {


@@ -237,9 +231,9 @@ gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win)
             ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
         }
         // Keep slider at an integral position
             ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
         }
         // Keep slider at an integral position

-        win->BlockScrollEvent();
-        gtk_range_set_value((GtkRange*)win->m_widget, win->GetValue());
-        win->UnblockScrollEvent();
+        win->m_blockScrollEvent = true;
+        gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue());
+        win->m_blockScrollEvent = false;

     }
 }
 }
     }
 }
 }


@@ -256,7 +250,7 @@ gtk_button_release_event(GtkRange* range, GdkEventButton*, wxSlider* win)
     if (win->m_isScrolling)
     {
         win->m_isScrolling = false;
     if (win->m_isScrolling)
     {
         win->m_isScrolling = false;

-        g_signal_handlers_unblock_by_func(range, (void*)gtk_event_after, win);
+        g_signal_handlers_unblock_by_func(range, (gpointer) gtk_event_after, win);

     }
     return false;
 }
     }
     return false;
 }


@@ -270,7 +264,7 @@ extern "C" {
 static gchar* gtk_format_value(GtkScale*, double value, void*)
 {
     // Format value as nearest integer
 static gchar* gtk_format_value(GtkScale*, double value, void*)
 {
     // Format value as nearest integer

-    return g_strdup_printf("%d", int(round(value)));
+    return g_strdup_printf("%d", wxRound(value));

 }
 }
 
 }
 }
 


@@ -283,17 +277,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 wxSlider::wxSlider()
 {
     m_pos = 0;
 wxSlider::wxSlider()
 {
     m_pos = 0;

-    m_scrollEventType = 0;
+    m_scrollEventType = GTK_SCROLL_NONE;

     m_needThumbRelease = false;
     m_needThumbRelease = false;

+    m_blockScrollEvent = false;

 }
 
 }
 

-bool wxSlider::Create(wxWindow *parent, wxWindowID id,
-        int value, int minValue, int maxValue,
-        const wxPoint& pos, const wxSize& size,
-        long style, const wxValidator& validator, const wxString& name )
+bool wxSlider::Create(wxWindow *parent,
+                      wxWindowID id,
+                      int value,
+                      int minValue,
+                      int maxValue,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
 {

-    m_acceptsFocus = true;
-    m_needParent = true;
+    m_pos = value;
+    m_scrollEventType = GTK_SCROLL_NONE;

 
     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 ))


@@ -302,18 +303,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_pos = 0;
-    m_scrollEventType = 0;
-    m_needThumbRelease = false;
-

     if (style & wxSL_VERTICAL)
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
 
     if (style & wxSL_VERTICAL)
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
 

-    gtk_scale_set_draw_value((GtkScale*)m_widget, (style & wxSL_LABELS) != 0);
+    gtk_scale_set_draw_value(GTK_SCALE (m_widget), (style & wxSL_LABELS) != 0);

     // Keep full precision in position value
     // Keep full precision in position value

-    gtk_scale_set_digits((GtkScale*)m_widget, -1);
+    gtk_scale_set_digits(GTK_SCALE (m_widget), -1);

 
     if (style & wxSL_INVERSE)
         gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
 
     if (style & wxSL_INVERSE)
         gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );


@@ -323,13 +320,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
     g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
     g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
     g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
     g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
     g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);

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

     g_signal_handler_block(m_widget, handler_id);
 
     SetRange( minValue, maxValue );
     g_signal_handler_block(m_widget, handler_id);
 
     SetRange( minValue, maxValue );

-    SetValue( value );
+
+    // don't call the public SetValue() as it won't do anything unless the
+    // value really changed
+    GTKSetValue( value );

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


@@ -340,47 +338,52 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
 int wxSlider::GetValue() const
 {
 
 int wxSlider::GetValue() const
 {

-    return int(round(m_pos));
+    return wxRound(m_pos);

 }
 
 void wxSlider::SetValue( int value )
 {
     if (GetValue() != value)
 }
 
 void wxSlider::SetValue( int value )
 {
     if (GetValue() != value)

-    {
-        BlockScrollEvent();
-        gtk_range_set_value((GtkRange*)m_widget, value);
-        UnblockScrollEvent();
-    }
+        GTKSetValue(value);
+}
+
+void wxSlider::GTKSetValue(int value)
+{
+    m_blockScrollEvent = true;
+    gtk_range_set_value(GTK_RANGE (m_widget), value);
+    m_blockScrollEvent = false;

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 {

-    BlockScrollEvent();
-    gtk_range_set_range((GtkRange*)m_widget, minValue, maxValue);
-    gtk_range_set_increments((GtkRange*)m_widget, 1, (maxValue - minValue + 9) / 10);
-    UnblockScrollEvent();
+    m_blockScrollEvent = true;
+    if (minValue == maxValue)
+       maxValue++;
+    gtk_range_set_range(GTK_RANGE (m_widget), minValue, maxValue);
+    gtk_range_set_increments(GTK_RANGE (m_widget), 1, (maxValue - minValue + 9) / 10);
+    m_blockScrollEvent = false;

 }
 
 int wxSlider::GetMin() const
 {
 }
 
 int wxSlider::GetMin() const
 {

-    return int(((GtkRange*)m_widget)->adjustment->lower);
+    return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->lower);

 }
 
 int wxSlider::GetMax() const
 {
 }
 
 int wxSlider::GetMax() const
 {

-    return int(((GtkRange*)m_widget)->adjustment->upper);
+    return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->upper);

 }
 
 void wxSlider::SetPageSize( int pageSize )
 {
 }
 
 void wxSlider::SetPageSize( int pageSize )
 {

-    BlockScrollEvent();
-    gtk_range_set_increments((GtkRange*)m_widget, 1, pageSize);
-    UnblockScrollEvent();
+    m_blockScrollEvent = true;
+    gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);
+    m_blockScrollEvent = false;

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

-    return int(((GtkRange*)m_widget)->adjustment->page_increment);
+    return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->page_increment);

 }
 
 // GTK does not support changing the size of the slider
 }
 
 // GTK does not support changing the size of the slider


@@ -393,19 +396,21 @@ int wxSlider::GetThumbLength() const
     return 0;
 }
 
     return 0;
 }
 

-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
+void wxSlider::SetLineSize( int lineSize )

 {
 {

+    m_blockScrollEvent = true;
+    gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());
+    m_blockScrollEvent = false;

 }
 
 int wxSlider::GetLineSize() const
 {
 }
 
 int wxSlider::GetLineSize() const
 {

-    return 0;
+    return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->step_increment);

 }
 
 }
 

-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    GtkRange *range = GTK_RANGE(m_widget);
-    return (range->event_window == window);
+    return GTK_RANGE(m_widget)->event_window;

 }
 
 // static
 }
 
 // static