X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2053b27b318fe81918a72c838944d1e8cd1524f..3372145d9daa42f680fc5aab7eb00e82d587c5a0:/src/gtk/scrolbar.cpp?ds=inline

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 84a46924ef..890112cdbd 100644
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -13,6 +13,9 @@
 #endif
 
 #include "wx/scrolbar.h"
+
+#if wxUSE_SCROLLBAR
+
 #include "wx/utils.h"
 #include <math.h>
 
@@ -134,17 +137,20 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     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;
 
-    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 );
-    
+    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), 
@@ -307,3 +313,4 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+#endif