no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index 9ddd84763e9180bc262562493604b2eeb464be70..4a0eb2dfdcfd3cb9af5a0b9a065dbd963cbe186e 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -16,7 +16,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxScrollBar;
+class WXDLLIMPEXP_FWD_CORE wxScrollBar;

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


@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
 {
 public:
     wxScrollBar()
 {
 public:
     wxScrollBar()

-       { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }
+       { m_adjust = NULL; m_oldPos = 0.0; }

     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
     inline wxScrollBar( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -42,7 +42,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;