sdasd

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h
index aa8f0f969ee6a1fdaf8a28f2fba704630c027880..651950e5e0350adbe6eae7b721492eb6ffd2fed7 100644 (file)
--- a/include/wx/gtk/slider.h
+++ b/include/wx/gtk/slider.h
@@ -40,10 +40,8 @@ extern const char *wxSliderNameStr;
 
 class wxSlider: public wxControl
 {
 
 class wxSlider: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxSlider)
-
-  public:
-    wxSlider(void);
+public:
+    wxSlider() {}

     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -54,7 +52,6 @@ class wxSlider: public wxControl
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }

-    ~wxSlider(void);

     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -62,27 +59,28 @@ class wxSlider: public wxControl
            long style = wxSL_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator, 
            const wxString& name = wxSliderNameStr );
            long style = wxSL_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator, 
            const wxString& name = wxSliderNameStr );

-    virtual int GetValue(void) const;
+    virtual int GetValue() const;

     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );
     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );

-    int GetMin(void) const;
-    int GetMax(void) const;
+    int GetMin() const;
+    int GetMax() const;

     void SetTickFreq( int n, int pos );
     void SetTickFreq( int n, int pos );

-    int GetTickFreq(void) const;
+    int GetTickFreq() const;

     void SetPageSize( int pageSize );
     void SetPageSize( int pageSize );

-    int GetPageSize(void) const;
-    void ClearSel(void);
-    void ClearTicks(void);
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();

     void SetLineSize( int lineSize );
     void SetLineSize( int lineSize );

-    int GetLineSize(void) const;
-    int GetSelEnd(void) const;
-    int GetSelStart(void) const;
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;

     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );
     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );

-    int GetThumbLength(void) const;
+    int GetThumbLength() const;

     void SetTick( int tickPos );
 
     void SetTick( int tickPos );
 

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

     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();


@@ -90,6 +88,8 @@ class wxSlider: public wxControl
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     

+private:
+    DECLARE_DYNAMIC_CLASS(wxSlider)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 378b7f0f94a052a45e06a130d5beb611e16df827..cdae9dad3b9dce536874443cacacb330bd49edf5 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -15,6 +15,12 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINBTN
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------


@@ -54,5 +60,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 

+#endif
+  // wxUSE_SPINBTN
+

 #endif
     // __GTKSPINBUTTH__
 #endif
     // __GTKSPINBUTTH__

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 1bb09317c69cad1319a3d38f806e7a7f5c21fa94..1fa6b82982ee8dcf9db587876ae1ae028612913a 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -15,6 +15,12 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------


@@ -53,6 +59,8 @@ public:
     virtual int GetMax() const;
 
     // implementation
     virtual int GetMax() const;
 
     // implementation

+    // --------------
+    

     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );


@@ -66,5 +74,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif
+    // wxUSE_SPINCTRL
+

 #endif
     // __GTKSPINCTRLH__
 #endif
     // __GTKSPINCTRLH__

diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h
index aa8f0f969ee6a1fdaf8a28f2fba704630c027880..651950e5e0350adbe6eae7b721492eb6ffd2fed7 100644 (file)
--- a/include/wx/gtk1/slider.h
+++ b/include/wx/gtk1/slider.h
@@ -40,10 +40,8 @@ extern const char *wxSliderNameStr;
 
 class wxSlider: public wxControl
 {
 
 class wxSlider: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxSlider)
-
-  public:
-    wxSlider(void);
+public:
+    wxSlider() {}

     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     inline wxSlider( wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -54,7 +52,6 @@ class wxSlider: public wxControl
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }
     {
       Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
     }

-    ~wxSlider(void);

     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,
     bool Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos = wxDefaultPosition,


@@ -62,27 +59,28 @@ class wxSlider: public wxControl
            long style = wxSL_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator, 
            const wxString& name = wxSliderNameStr );
            long style = wxSL_HORIZONTAL,
            const wxValidator& validator = wxDefaultValidator, 
            const wxString& name = wxSliderNameStr );

-    virtual int GetValue(void) const;
+    virtual int GetValue() const;

     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );
     virtual void SetValue( int );
     void SetRange( int minValue, int maxValue );

-    int GetMin(void) const;
-    int GetMax(void) const;
+    int GetMin() const;
+    int GetMax() const;

     void SetTickFreq( int n, int pos );
     void SetTickFreq( int n, int pos );

-    int GetTickFreq(void) const;
+    int GetTickFreq() const;

     void SetPageSize( int pageSize );
     void SetPageSize( int pageSize );

-    int GetPageSize(void) const;
-    void ClearSel(void);
-    void ClearTicks(void);
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();

     void SetLineSize( int lineSize );
     void SetLineSize( int lineSize );

-    int GetLineSize(void) const;
-    int GetSelEnd(void) const;
-    int GetSelStart(void) const;
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;

     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );
     void SetSelection( int minPos, int maxPos );
     void SetThumbLength( int len );

-    int GetThumbLength(void) const;
+    int GetThumbLength() const;

     void SetTick( int tickPos );
 
     void SetTick( int tickPos );
 

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

     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();


@@ -90,6 +88,8 @@ class wxSlider: public wxControl
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
     

+private:
+    DECLARE_DYNAMIC_CLASS(wxSlider)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
index 378b7f0f94a052a45e06a130d5beb611e16df827..cdae9dad3b9dce536874443cacacb330bd49edf5 100644 (file)
--- a/include/wx/gtk1/spinbutt.h
+++ b/include/wx/gtk1/spinbutt.h
@@ -15,6 +15,12 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINBTN
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------


@@ -54,5 +60,8 @@ private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };
 

+#endif
+  // wxUSE_SPINBTN
+

 #endif
     // __GTKSPINBUTTH__
 #endif
     // __GTKSPINBUTTH__

diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h
index 1bb09317c69cad1319a3d38f806e7a7f5c21fa94..1fa6b82982ee8dcf9db587876ae1ae028612913a 100644 (file)
--- a/include/wx/gtk1/spinctrl.h
+++ b/include/wx/gtk1/spinctrl.h
@@ -15,6 +15,12 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINCTRL
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------


@@ -53,6 +59,8 @@ public:
     virtual int GetMax() const;
 
     // implementation
     virtual int GetMax() const;
 
     // implementation

+    // --------------
+    

     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );
     void OnChar( wxKeyEvent &event );
     
     bool IsOwnGtkWindow( GdkWindow *window );


@@ -66,5 +74,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif
+    // wxUSE_SPINCTRL
+

 #endif
     // __GTKSPINCTRLH__
 #endif
     // __GTKSPINCTRLH__