wxScrollBar::Create() produced always vertical scrollbar

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 56cc1d6d5830045d23c8bdecf157f491de83ed05..890112cdbd6aa84ada47dbca2f5787261859d4e6 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -146,11 +146,11 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     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), 

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 56cc1d6d5830045d23c8bdecf157f491de83ed05..890112cdbd6aa84ada47dbca2f5787261859d4e6 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -146,11 +146,11 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     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),