Disabled memory tracing code for mingw32,

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

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index 5bb14787bf4c84aa72a9f91e743966df2b75b69d..612c37afae2fda5d46acce2d88aafa80bbaa41a8 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_SCROLLBAR
+

 #include "wx/object.h"
 #include "wx/control.h"
 
 #include "wx/object.h"
 #include "wx/control.h"
 


@@ -37,11 +40,9 @@ extern const char *wxScrollBarNameStr;
 
 class wxScrollBar: public wxControl
 {
 
 class wxScrollBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-  public:
-  
-    wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
+public:
+    wxScrollBar() 
+       { m_adjust = (GtkAdjustment *) 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,


@@ -49,7 +50,7 @@ class wxScrollBar: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr )
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr )
     {

-      Create( parent, id, pos, size, style, validator, name );
+        Create( parent, id, pos, size, style, validator, name );

     }
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
     }
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -57,16 +58,17 @@ class wxScrollBar: public wxControl
            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(void);
-    int GetPosition(void) const;
+    ~wxScrollBar();
+    int GetThumbPosition() const;

     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;
     int GetThumbSize() const;
     int GetPageSize() const;
     int GetRange() const;

-    virtual void SetPosition( int viewStart );
+    virtual void SetThumbPosition( int viewStart );

     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 
     virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize,
       bool refresh = TRUE );
 

-  // Backward compatibility
+    // Backward compatibility
+    // ----------------------

     
     int GetValue(void) const;
     void SetValue( int viewStart );
     
     int GetValue(void) const;
     void SetValue( int viewStart );


@@ -77,14 +79,20 @@ class wxScrollBar: public wxControl
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 
     void SetObjectLength( int objectLength );
     void SetViewLength( int viewLength );
 

-  // implementation    
+    // implementation
+    // --------------

     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
   
     GtkAdjustment  *m_adjust;
     float           m_oldPos;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)

 };
 
 };
 

+#endif
+

 #endif
     // __GTKSCROLLBARH__
 #endif
     // __GTKSCROLLBARH__