X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/slider.cpp

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 891fcf61f9..3f2b9b84f8 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -17,24 +17,24 @@
 #include "wx/utils.h"
 
 //-----------------------------------------------------------------------------
-// wxSlider
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
 //-----------------------------------------------------------------------------
 
-void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
+static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 { 
-/*
-  printf( "OnScroll from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
   if (!win->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
     
   float diff = win->m_adjust->value - win->m_oldPos;
   if (fabs(diff) < 0.2) return;
   
-  int command = 0;
+  wxEventType command = wxEVT_NULL;
   
   float line_step = win->m_adjust->step_increment;
   float page_step = win->m_adjust->page_increment;
@@ -48,7 +48,7 @@ void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
   int value = (int)(win->m_adjust->value+0.5);
       
   int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxHORIZONTAL;
+  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
   
   wxScrollEvent event( command, win->GetId(), value, orient );
   event.SetEventObject( win );
@@ -57,46 +57,39 @@ void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
   wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
   cevent.SetEventObject( win );
   win->ProcessEvent( cevent );
-};
+}
+
+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
 
 wxSlider::wxSlider(void)
 {
-};
-
-wxSlider::wxSlider( wxWindow *parent, const wxWindowID id,
-        const int value, const int minValue, const int maxValue,
-        const wxPoint& pos, const wxSize& size,
-        const long style,
-/*      const wxValidator& validator = wxDefaultValidator, */
-        const wxString& name )
-{
-  Create( parent, id, value, minValue, maxValue,
-          pos, size, style, name );
-};
+}
 
 wxSlider::~wxSlider(void)
 {
-};
+}
 
-bool wxSlider::Create(wxWindow *parent, const wxWindowID id,
-        const int value, const int minValue, const int maxValue,
+bool wxSlider::Create(wxWindow *parent, wxWindowID id,
+        int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
-        const long style,
-/*      const wxValidator& validator = wxDefaultValidator, */
-        const wxString& name )
+        long style, const wxValidator& validator, const wxString& name )
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   
+  SetValidator( validator );
+
   m_oldPos = 0.0;
 
   if (style & wxSL_VERTICAL == wxSL_VERTICAL)
-    m_widget = gtk_hscale_new( NULL );
+    m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
   else
-    m_widget = gtk_vscale_new( NULL );
+    m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     
   m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
   
@@ -110,14 +103,14 @@ bool wxSlider::Create(wxWindow *parent, const wxWindowID id,
   Show( TRUE );
     
   return TRUE;
-};
+}
 
 int wxSlider::GetValue(void) const
 {
   return (int)(m_adjust->value+0.5);
-};
+}
 
-void wxSlider::SetValue( const int value )
+void wxSlider::SetValue( int value )
 {
   float fpos = (float)value;
   m_oldPos = fpos;
@@ -125,9 +118,9 @@ void wxSlider::SetValue( const int value )
   m_adjust->value = fpos;
   
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
-};
+}
 
-void wxSlider::SetRange( const int minValue, const int maxValue )
+void wxSlider::SetRange( int minValue, int maxValue )
 {
   float fmin = (float)minValue;
   float fmax = (float)maxValue;
@@ -140,19 +133,19 @@ void wxSlider::SetRange( const int minValue, const int maxValue )
   m_adjust->upper = fmax;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+}
 
 int wxSlider::GetMin(void) const
 {
   return (int)(m_adjust->lower+0.5);
-};
+}
 
 int wxSlider::GetMax(void) const
 {
   return (int)(m_adjust->upper+0.5);
-};
+}
 
-void wxSlider::SetPageSize( const int pageSize )
+void wxSlider::SetPageSize( int pageSize )
 {
   float fpage = (float)pageSize;
       
@@ -161,14 +154,14 @@ void wxSlider::SetPageSize( const int pageSize )
   m_adjust->page_increment = fpage;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+}
 
 int wxSlider::GetPageSize(void) const
 {
   return (int)(m_adjust->page_increment+0.5);
-};
+}
 
-void wxSlider::SetThumbLength( const int len )
+void wxSlider::SetThumbLength( int len )
 {
   float flen = (float)len;
       
@@ -177,71 +170,82 @@ void wxSlider::SetThumbLength( const int len )
   m_adjust->page_size = flen;
 
   gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-};
+}
 
 int wxSlider::GetThumbLength(void) const
 {
   return (int)(m_adjust->page_size+0.5);
-};
+}
 
-void wxSlider::SetLineSize( const int WXUNUSED(lineSize) )
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
-};
+}
 
 int wxSlider::GetLineSize(void) const
 {
   return 0;
-};
+}
 
 // not supported in wxGTK (and GTK)
 
 void wxSlider::GetSize( int *x, int *y ) const
 {
   wxWindow::GetSize( x, y );
-};
+}
 
-void wxSlider::SetSize( const int x, const int y, const int width, const int height, const int sizeFlags )
+void wxSlider::SetSize( int x, int y, int width, int height, int sizeFlags )
 {
   wxWindow::SetSize( x, y, width, height, sizeFlags );
-};
+}
 
 void wxSlider::GetPosition( int *x, int *y ) const
 {
   wxWindow::GetPosition( x, y );
-};
+}
 
-void wxSlider::SetTick( const int WXUNUSED(tickPos) )
+void wxSlider::SetTick( int WXUNUSED(tickPos) )
 {
-};
+}
 
-void wxSlider::SetTickFreq( const int WXUNUSED(n), const int WXUNUSED(pos) )
+void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
 {
-};
+}
 
 int wxSlider::GetTickFreq(void) const
 {
   return 0;
-};
+}
 
 void wxSlider::ClearTicks(void)
 {
-};
+}
 
-void wxSlider::SetSelection( const int WXUNUSED(minPos), const int WXUNUSED(maxPos) )
+void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
 {
-};
+}
 
 int wxSlider::GetSelEnd(void) const
 {
   return 0;
-};
+}
 
 int wxSlider::GetSelStart(void) const
 {
   return 0;
-};
+}
 
 void wxSlider::ClearSel(void)
 {
-};
+}
+
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+{
+  GtkRange *range = GTK_RANGE(m_widget);
+  return ( (window == GTK_WIDGET(range)->window) ||
+           (window == range->trough) ||
+	   (window == range->slider) ||
+	   (window == range->step_forw) ||
+	   (window == range->step_back) );
+}
+