Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 37d64dbae6ef1d5852e1821637b95f99fac71d97..e49bb7a2cec55072fb7a228c70fec8d7b0be2df6 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -1,22 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSCROLLBARH__
-#define __GTKSCROLLBARH__
-
-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScrollBar;
+#ifndef _WX_GTK_SCROLLBAR_H_
+#define _WX_GTK_SCROLLBAR_H_

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


@@ -41,7 +32,7 @@ public:
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );
            long style = wxSB_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr );

-    ~wxScrollBar();
+    virtual ~wxScrollBar();

     int GetThumbPosition() const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetThumbPosition() const;
     int GetThumbSize() const;
     int GetPageSize() const;


@@ -56,15 +47,8 @@ public:
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
-    // implementation
-    // --------------
-
-    bool IsOwnGtkWindow( GdkWindow *window );

 
 

-private:

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

-#endif
-    // __GTKSCROLLBARH__
+#endif // _WX_GTK_SCROLLBAR_H_