Only send keypress events to focus widget, not its parents

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 86f7f8f5bf7194459ab0edf9b16de493566dc94f..ea7478c5194ffeb18b2ae7df97f3e8ea613037b0 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -38,7 +38,7 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
     const double value = gtk_spin_button_get_value(spinbutton);
     const int pos = int(value);
     const int oldPos = win->m_pos;
     const double value = gtk_spin_button_get_value(spinbutton);
     const int pos = int(value);
     const int oldPos = win->m_pos;

-    if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent || pos == oldPos)
+    if (!win->m_hasVMT || g_blockEventsOnDrag || pos == oldPos)

     {
         win->m_pos = pos;
         return;
     {
         win->m_pos = pos;
         return;


@@ -52,9 +52,9 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
         !event.IsAllowed() )
     {
         /* program has vetoed */
         !event.IsAllowed() )
     {
         /* program has vetoed */

-        win->BlockScrollEvent();
+        // this will cause another "value_changed" signal,
+        // but because pos == oldPos nothing will happen

         gtk_spin_button_set_value(spinbutton, oldPos);
         gtk_spin_button_set_value(spinbutton, oldPos);

-        win->UnblockScrollEvent();

         return;
     }
 
         return;
     }
 


@@ -91,8 +91,6 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
                           long style,
                           const wxString& name)
 {

-    m_needParent = true;
-

     wxSize new_size = size,
            sizeBest = DoGetBestSize();
     new_size.x = sizeBest.x;            // override width always
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
     new_size.x = sizeBest.x;            // override width always


@@ -152,18 +150,20 @@ void wxSpinButton::SetValue( int value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 

-    BlockScrollEvent();
+    GtkDisableEvents();

     gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);
     gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);

-    UnblockScrollEvent();
+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));
+    GtkEnableEvents();

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 

-    BlockScrollEvent();
+    GtkDisableEvents();

     gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
     gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);

-    UnblockScrollEvent();
+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));
+    GtkEnableEvents();

 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
 }
 
 void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )


@@ -174,6 +174,18 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
     gtk_widget_set_size_request( m_widget, m_width, m_height );
 }
 
     gtk_widget_set_size_request( m_widget, m_width, m_height );
 }
 

+void wxSpinButton::GtkDisableEvents() const
+{
+    g_signal_handlers_block_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);
+}
+
+void wxSpinButton::GtkEnableEvents() const
+{
+    g_signal_handlers_unblock_by_func(m_widget,
+        (gpointer)gtk_value_changed, (void*) this);
+}
+

 GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
     return GTK_SPIN_BUTTON(m_widget)->panel;
 GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
     return GTK_SPIN_BUTTON(m_widget)->panel;