From a075e27bf3c21a4fa2a8b6349ea194132fdb3497 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 27 Nov 1999 16:43:47 +0000 Subject: [PATCH] sdasd git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/slider.h | 34 +++++++++++++++++----------------- include/wx/gtk/spinbutt.h | 9 +++++++++ include/wx/gtk/spinctrl.h | 11 +++++++++++ include/wx/gtk1/slider.h | 34 +++++++++++++++++----------------- include/wx/gtk1/spinbutt.h | 9 +++++++++ include/wx/gtk1/spinctrl.h | 11 +++++++++++ 6 files changed, 74 insertions(+), 34 deletions(-) diff --git a/include/wx/gtk/slider.h b/include/wx/gtk/slider.h index aa8f0f969e..651950e5e0 100644 --- a/include/wx/gtk/slider.h +++ b/include/wx/gtk/slider.h @@ -40,10 +40,8 @@ extern const char *wxSliderNameStr; 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, @@ -54,7 +52,6 @@ class wxSlider: public wxControl { 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, @@ -62,27 +59,28 @@ class wxSlider: public wxControl 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 ); - int GetMin(void) const; - int GetMax(void) const; + int GetMin() const; + int GetMax() const; void SetTickFreq( int n, int pos ); - int GetTickFreq(void) const; + int GetTickFreq() const; 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 ); - 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 ); - int GetThumbLength(void) const; + int GetThumbLength() const; void SetTick( int tickPos ); - // implementation + // implementation + // -------------- bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); @@ -90,6 +88,8 @@ class wxSlider: public wxControl GtkAdjustment *m_adjust; float m_oldPos; +private: + DECLARE_DYNAMIC_CLASS(wxSlider) }; #endif diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h index 378b7f0f94..cdae9dad3b 100644 --- a/include/wx/gtk/spinbutt.h +++ b/include/wx/gtk/spinbutt.h @@ -15,6 +15,12 @@ #pragma interface #endif +#include "wx/defs.h" + +#if wxUSE_SPINBTN + +#include "wx/control.h" + //----------------------------------------------------------------------------- // wxSpinButton //----------------------------------------------------------------------------- @@ -54,5 +60,8 @@ private: DECLARE_DYNAMIC_CLASS(wxSpinButton) }; +#endif + // wxUSE_SPINBTN + #endif // __GTKSPINBUTTH__ diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h index 1bb09317c6..1fa6b82982 100644 --- a/include/wx/gtk/spinctrl.h +++ b/include/wx/gtk/spinctrl.h @@ -15,6 +15,12 @@ #pragma interface #endif +#include "wx/defs.h" + +#if wxUSE_SPINCTRL + +#include "wx/control.h" + //----------------------------------------------------------------------------- // wxSpinCtrl //----------------------------------------------------------------------------- @@ -53,6 +59,8 @@ public: virtual int GetMax() const; // implementation + // -------------- + void OnChar( wxKeyEvent &event ); bool IsOwnGtkWindow( GdkWindow *window ); @@ -66,5 +74,8 @@ private: DECLARE_EVENT_TABLE() }; +#endif + // wxUSE_SPINCTRL + #endif // __GTKSPINCTRLH__ diff --git a/include/wx/gtk1/slider.h b/include/wx/gtk1/slider.h index aa8f0f969e..651950e5e0 100644 --- a/include/wx/gtk1/slider.h +++ b/include/wx/gtk1/slider.h @@ -40,10 +40,8 @@ extern const char *wxSliderNameStr; 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, @@ -54,7 +52,6 @@ class wxSlider: public wxControl { 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, @@ -62,27 +59,28 @@ class wxSlider: public wxControl 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 ); - int GetMin(void) const; - int GetMax(void) const; + int GetMin() const; + int GetMax() const; void SetTickFreq( int n, int pos ); - int GetTickFreq(void) const; + int GetTickFreq() const; 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 ); - 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 ); - int GetThumbLength(void) const; + int GetThumbLength() const; void SetTick( int tickPos ); - // implementation + // implementation + // -------------- bool IsOwnGtkWindow( GdkWindow *window ); void ApplyWidgetStyle(); @@ -90,6 +88,8 @@ class wxSlider: public wxControl GtkAdjustment *m_adjust; float m_oldPos; +private: + DECLARE_DYNAMIC_CLASS(wxSlider) }; #endif diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h index 378b7f0f94..cdae9dad3b 100644 --- a/include/wx/gtk1/spinbutt.h +++ b/include/wx/gtk1/spinbutt.h @@ -15,6 +15,12 @@ #pragma interface #endif +#include "wx/defs.h" + +#if wxUSE_SPINBTN + +#include "wx/control.h" + //----------------------------------------------------------------------------- // wxSpinButton //----------------------------------------------------------------------------- @@ -54,5 +60,8 @@ private: DECLARE_DYNAMIC_CLASS(wxSpinButton) }; +#endif + // wxUSE_SPINBTN + #endif // __GTKSPINBUTTH__ diff --git a/include/wx/gtk1/spinctrl.h b/include/wx/gtk1/spinctrl.h index 1bb09317c6..1fa6b82982 100644 --- a/include/wx/gtk1/spinctrl.h +++ b/include/wx/gtk1/spinctrl.h @@ -15,6 +15,12 @@ #pragma interface #endif +#include "wx/defs.h" + +#if wxUSE_SPINCTRL + +#include "wx/control.h" + //----------------------------------------------------------------------------- // wxSpinCtrl //----------------------------------------------------------------------------- @@ -53,6 +59,8 @@ public: virtual int GetMax() const; // implementation + // -------------- + void OnChar( wxKeyEvent &event ); bool IsOwnGtkWindow( GdkWindow *window ); @@ -66,5 +74,8 @@ private: DECLARE_EVENT_TABLE() }; +#endif + // wxUSE_SPINCTRL + #endif // __GTKSPINCTRLH__ -- 2.45.2