Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index f6839196420d722080bc7e373d241146a0a2dd99..aa8f0f969ee6a1fdaf8a28f2fba704630c027880 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -2,13 +2,11 @@
 // Name:        slider.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        slider.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 
 #ifndef __GTKSLIDERH__
 #define __GTKSLIDERH__
 


@@ -17,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_SLIDER
+

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


@@ -63,9 +64,6 @@ class wxSlider: public wxControl
            const wxString& name = wxSliderNameStr );
     virtual int GetValue(void) const;
     virtual void SetValue( int );
            const wxString& name = wxSliderNameStr );
     virtual int GetValue(void) const;
     virtual void SetValue( int );

-    void GetSize( int *x, int *y ) const;
-    void SetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
-    void GetPosition( int *x, int *y ) const;

     void SetRange( int minValue, int maxValue );
     int GetMin(void) const;
     int GetMax(void) const;
     void SetRange( int minValue, int maxValue );
     int GetMin(void) const;
     int GetMax(void) const;


@@ -87,10 +85,13 @@ class wxSlider: public wxControl
   // implementation    
     
     bool IsOwnGtkWindow( GdkWindow *window );
   // implementation    
     
     bool IsOwnGtkWindow( GdkWindow *window );

+    void ApplyWidgetStyle();

     
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
 };
 
     
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
 };
 

+#endif
+

 #endif // __GTKSLIDERH__
 #endif // __GTKSLIDERH__