serbase.cpp added to the list of files

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

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 39aba4ce4698c1624b0b0010966f4628a85f11ce..890112cdbd6aa84ada47dbca2f5787261859d4e6 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -13,12 +13,22 @@
 #endif
 
 #include "wx/scrolbar.h"
 #endif
 
 #include "wx/scrolbar.h"

+
+#if wxUSE_SCROLLBAR
+

 #include "wx/utils.h"
 #include <math.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "wx/utils.h"
 #include <math.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

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


@@ -32,7 +42,9 @@ extern bool   g_blockEventsOnScroll;
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 { 
 
 static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *win )
 { 

-    if (!win->HasVMT()) return;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;


@@ -44,7 +56,7 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
     float line_step = win->m_adjust->step_increment;
     float page_step = win->m_adjust->page_increment;
   
     float line_step = win->m_adjust->step_increment;
     float page_step = win->m_adjust->page_increment;
   

-    if (win->m_isScrolling)
+    if (win->IsScrolling())

     {
         command = wxEVT_SCROLL_THUMBTRACK;
     }
     {
         command = wxEVT_SCROLL_THUMBTRACK;
     }


@@ -61,8 +73,7 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
 
     int value = (int)(win->m_adjust->value+0.5);
       
 
     int value = (int)(win->m_adjust->value+0.5);
       

-    int orient = wxHORIZONTAL;
-    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
+    int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;

   
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
   
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );


@@ -81,12 +92,14 @@ static void gtk_scrollbar_callback( GtkWidget *WXUNUSED(widget), wxScrollBar *wi
 
 static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
                                                  GdkEventButton *WXUNUSED(gdk_event), 
 
 static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), 
                                                  GdkEventButton *WXUNUSED(gdk_event), 

-                                                wxScrollBar *win )
+                                                 wxScrollBar *win )

 {
 {

-  win->m_isScrolling = TRUE;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    win->SetScrolling(TRUE);

 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   
 //  g_blockEventsOnScroll = TRUE;  doesn't work in DialogEd
   

-  return FALSE;
+    return FALSE;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -95,9 +108,11 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
 
 static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
                                                    GdkEventButton *WXUNUSED(gdk_event), 
 
 static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
                                                    GdkEventButton *WXUNUSED(gdk_event), 

-                                                  wxScrollBar *win )
+                                                   wxScrollBar *win )

 {
 {

-    win->m_isScrolling = FALSE;
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    win->SetScrolling(FALSE);

 //  g_blockEventsOnScroll = FALSE;
   
     gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
 //  g_blockEventsOnScroll = FALSE;
   
     gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );


@@ -122,37 +137,38 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
   
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
   

-    PreCreation( parent, id, pos, size, style, name );
-  
-    SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( _T("wxScrollBar creation failed") );
+       return FALSE;
+    }

 
     m_oldPos = 0.0;
 
 
     m_oldPos = 0.0;
 

-    if (style & wxSB_VERTICAL == wxSB_VERTICAL)
-        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
-    else
+    if ((style & wxSB_VERTICAL) == wxSB_VERTICAL)

         m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );
         m_widget = gtk_vscrollbar_new( (GtkAdjustment *) NULL );

-    
+    else
+        m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
+

     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
   
     gtk_signal_connect( GTK_OBJECT(m_adjust), 
                         "value_changed",
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
   
     gtk_signal_connect( GTK_OBJECT(m_adjust), 
                         "value_changed",

-                       (GtkSignalFunc) gtk_scrollbar_callback, 
-                       (gpointer) this );
+                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (gpointer) this );

   
     gtk_signal_connect( GTK_OBJECT(m_widget), 
                         "button_press_event",
                         (GtkSignalFunc)gtk_scrollbar_button_press_callback, 
   
     gtk_signal_connect( GTK_OBJECT(m_widget), 
                         "button_press_event",
                         (GtkSignalFunc)gtk_scrollbar_button_press_callback, 

-                       (gpointer) this );
+                        (gpointer) this );

 
     gtk_signal_connect( GTK_OBJECT(m_widget), 
                         "button_release_event",
                         (GtkSignalFunc)gtk_scrollbar_button_release_callback, 
 
     gtk_signal_connect( GTK_OBJECT(m_widget), 
                         "button_release_event",
                         (GtkSignalFunc)gtk_scrollbar_button_release_callback, 

-                       (gpointer) this );
+                        (gpointer) this );

 
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

   
     PostCreation();
   
   
     PostCreation();
   


@@ -286,9 +302,9 @@ bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window )
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window) ||
              (window == range->trough) ||
     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) );
+             (window == range->slider) ||
+             (window == range->step_forw) ||
+             (window == range->step_back) );

 }
 
 void wxScrollBar::ApplyWidgetStyle()
 }
 
 void wxScrollBar::ApplyWidgetStyle()


@@ -297,3 +313,4 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+#endif