added missing headers (patch 1774617)

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

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 6dbfe5b1072db1efe7e228790889b77bfce6c0c2..6be5c3a20970760179068a2df5da1e05dd690a05 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -19,7 +19,7 @@
     #include "wx/utils.h"
 #endif
 
     #include "wx/utils.h"
 #endif
 

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

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


@@ -35,8 +35,6 @@ extern "C" {
 static void
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
 {
 static void
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     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;


@@ -93,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


@@ -154,18 +150,18 @@ 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();
+    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();
+    GtkEnableEvents();

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


@@ -176,9 +172,21 @@ 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 );
 }
 

-bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
+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 == window;
+    return GTK_SPIN_BUTTON(m_widget)->panel;

 }
 
 wxSize wxSpinButton::DoGetBestSize() const
 }
 
 wxSize wxSpinButton::DoGetBestSize() const