Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / gtk / scrolbar.h

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index d66010cb08a532444019789bcd5abfc6494e124b..fb9ab1bc9f8e6d63e21237e5e373ade3289f9a5a 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrolbar.h
+// Name:        wx/gtk/scrolbar.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,14 +10,6 @@
 #ifndef _WX_GTK_SCROLLBAR_H_
 #define _WX_GTK_SCROLLBAR_H_
 
 #ifndef _WX_GTK_SCROLLBAR_H_
 #define _WX_GTK_SCROLLBAR_H_
 

-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-

 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxScrollBar
 //-----------------------------------------------------------------------------


@@ -56,11 +48,7 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
-protected:
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };