security fix to wxSingleInstanceChecker: check if the lock file was really created...

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

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 14530aef2481d411d71545cdf940e7758575a60b..6dcd71ec52c1cf16b1a9837e02189e8fd015c646 100644 (file)
--- 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
 
 #pragma implementation "scrolbar.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_SCROLLBAR
 
 
 #if wxUSE_SCROLLBAR
 


@@ -178,11 +179,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -334,4 +331,16 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+wxSize wxScrollBar::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
+// static
+wxVisualAttributes
+wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new);
+}
+

 #endif
 #endif