X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..e0c5c96f67eaf13ccbd378616bdf98c8dba01e78:/src/gtk/scrolbar.cpp

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index b8fc5dbf97..edc4f34d71 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -8,11 +8,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "scrolbar.h"
 #endif
 
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SCROLLBAR
 
@@ -49,28 +50,28 @@ static const float sensitivity = 0.02;
 static void gtk_scrollbar_callback( GtkAdjustment *adjust,
                                     SCROLLBAR_CBACK_ARG
                                     wxScrollBar *win )
-{ 
+{
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
-    
+
     float diff = adjust->value - win->m_oldPos;
     if (fabs(diff) < sensitivity) return;
-    
+
     win->m_oldPos = adjust->value;
 
     wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
 
     double dvalue = adjust->value;
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
-      
+
     int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
-  
+
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
-  
+
 /*
     wxCommandEvent cevent( wxEVT_COMMAND_SCROLLBAR_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
@@ -82,8 +83,8 @@ static void gtk_scrollbar_callback( GtkAdjustment *adjust,
 // "button_press_event" from slider
 //-----------------------------------------------------------------------------
 
-static gint gtk_scrollbar_button_press_callback( GtkRange *widget, 
-                                                 GdkEventButton *gdk_event, 
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,
                                                  wxScrollBar *win )
 {
     if (g_isIdle) wxapp_install_idle_handler();
@@ -94,7 +95,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
 #ifndef __WXGTK20__
     win->m_isScrolling = (gdk_event->window == widget->slider);
 #endif
-  
+
     return FALSE;
 }
 
@@ -102,27 +103,29 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
 // "button_release_event" from slider
 //-----------------------------------------------------------------------------
 
-static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget), 
-                                                   GdkEventButton *WXUNUSED(gdk_event), 
-                                                   wxScrollBar *win )
+static gint
+gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+                                       GdkEventButton *WXUNUSED(gdk_event),
+                                       wxScrollBar *win )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-    
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
 //  g_blockEventsOnScroll = FALSE;
-  
+
     if (win->m_isScrolling)
     {
         wxEventType command = wxEVT_SCROLL_THUMBRELEASE;
         int value = (int)ceil(win->m_adjust->value);
-        int dir = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
+        int orient = win->HasFlag(wxSB_VERTICAL) ? wxVERTICAL : wxHORIZONTAL;
 
-        wxScrollEvent event( command, value, dir );
+        wxScrollEvent event( command, win->GetId(), value, orient );
         event.SetEventObject( win );
         win->GetEventHandler()->ProcessEvent( event );
     }
-      
+
     win->m_isScrolling = FALSE;
-    
+
     return FALSE;
 }
 
@@ -142,7 +145,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
-  
+
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -158,30 +161,31 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         m_widget = gtk_hscrollbar_new( (GtkAdjustment *) NULL );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-  
-    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT(m_adjust),
                         "value_changed",
-                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (GtkSignalFunc) gtk_scrollbar_callback,
                         (gpointer) this );
-  
-    gtk_signal_connect( GTK_OBJECT(m_widget), 
+
+    gtk_signal_connect( GTK_OBJECT(m_widget),
                         "button_press_event",
-                        (GtkSignalFunc)gtk_scrollbar_button_press_callback, 
+                        (GtkSignalFunc)gtk_scrollbar_button_press_callback,
                         (gpointer) this );
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), 
+    gtk_signal_connect( GTK_OBJECT(m_widget),
                         "button_release_event",
-                        (GtkSignalFunc)gtk_scrollbar_button_release_callback, 
+                        (GtkSignalFunc)gtk_scrollbar_button_release_callback,
                         (gpointer) this );
 
     m_parent->DoAddChild( this );
-  
+
     PostCreation();
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    InheritAttributes();
+
+    SetBestSize(size);
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -209,21 +213,21 @@ int wxScrollBar::GetRange() const
 void wxScrollBar::SetThumbPosition( int viewStart )
 {
     if (m_isScrolling) return;
-  
+
     float fpos = (float)viewStart;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     m_adjust->value = fpos;
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), 
-                        (GtkSignalFunc) gtk_scrollbar_callback, 
+
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        (GtkSignalFunc) gtk_scrollbar_callback,
                         (gpointer) this );
-                        
+
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
-    
-    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT(m_adjust),
                         "value_changed",
-                        (GtkSignalFunc) gtk_scrollbar_callback, 
+                        (GtkSignalFunc) gtk_scrollbar_callback,
                         (gpointer) this );
 }
 
@@ -234,7 +238,7 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
     float frange = (float)range;
     float fthumb = (float)thumbSize;
     float fpage = (float)pageSize;
-      
+
     if ((fabs(frange-m_adjust->upper) < 0.2) &&
         (fabs(fthumb-m_adjust->page_size) < 0.2) &&
         (fabs(fpage-m_adjust->page_increment) < 0.2))
@@ -242,9 +246,9 @@ void wxScrollBar::SetScrollbar( int position, int thumbSize, int range, int page
         SetThumbPosition( position );
         return;
     }
-  
+
     m_oldPos = fpos;
-  
+
     m_adjust->lower = 0.0;
     m_adjust->upper = frange;
     m_adjust->value = fpos;
@@ -272,7 +276,7 @@ void wxScrollBar::GetValues( int *viewStart, int *viewLength, int *objectLength,
     int thumb = (int)(m_adjust->page_size+0.5);
     int page = (int)(m_adjust->page_increment+0.5);
     int range = (int)(m_adjust->upper+0.5);
-  
+
     *viewStart = pos;
     *viewLength = range;
     *objectLength = thumb;
@@ -332,4 +336,9 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+wxSize wxScrollBar::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
 #endif