git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-27 16:43:47 +00:00
parent 9826157f41
commit a075e27bf3
6 changed files with 74 additions and 34 deletions

View File

@@ -40,10 +40,8 @@ extern const char *wxSliderNameStr;
class wxSlider: public wxControl class wxSlider: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxSlider)
public: public:
wxSlider(void); wxSlider() {}
inline wxSlider( wxWindow *parent, wxWindowID id, inline wxSlider( wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, 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, bool Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -62,27 +59,28 @@ class wxSlider: public wxControl
long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr ); const wxString& name = wxSliderNameStr );
virtual int GetValue(void) const; virtual int GetValue() const;
virtual void SetValue( int ); virtual void SetValue( int );
void SetRange( int minValue, int maxValue ); void SetRange( int minValue, int maxValue );
int GetMin(void) const; int GetMin() const;
int GetMax(void) 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; int GetPageSize() const;
void ClearSel(void); void ClearSel();
void ClearTicks(void); void ClearTicks();
void SetLineSize( int lineSize ); void SetLineSize( int lineSize );
int GetLineSize(void) const; int GetLineSize() const;
int GetSelEnd(void) const; int GetSelEnd() const;
int GetSelStart(void) const; int GetSelStart() const;
void SetSelection( int minPos, int maxPos ); void SetSelection( int minPos, int maxPos );
void SetThumbLength( int len ); 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 ); bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle(); void ApplyWidgetStyle();
@@ -90,6 +88,8 @@ class wxSlider: public wxControl
GtkAdjustment *m_adjust; GtkAdjustment *m_adjust;
float m_oldPos; float m_oldPos;
private:
DECLARE_DYNAMIC_CLASS(wxSlider)
}; };
#endif #endif

View File

@@ -15,6 +15,12 @@
#pragma interface #pragma interface
#endif #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 #endif
// __GTKSPINBUTTH__ // __GTKSPINBUTTH__

View File

@@ -15,6 +15,12 @@
#pragma interface #pragma interface
#endif #endif
#include "wx/defs.h"
#if wxUSE_SPINCTRL
#include "wx/control.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxSpinCtrl // wxSpinCtrl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -53,6 +59,8 @@ public:
virtual int GetMax() const; virtual int GetMax() const;
// implementation // implementation
// --------------
void OnChar( wxKeyEvent &event ); void OnChar( wxKeyEvent &event );
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
@@ -66,5 +74,8 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif
// wxUSE_SPINCTRL
#endif #endif
// __GTKSPINCTRLH__ // __GTKSPINCTRLH__

View File

@@ -40,10 +40,8 @@ extern const char *wxSliderNameStr;
class wxSlider: public wxControl class wxSlider: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxSlider)
public: public:
wxSlider(void); wxSlider() {}
inline wxSlider( wxWindow *parent, wxWindowID id, inline wxSlider( wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, 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, bool Create(wxWindow *parent, wxWindowID id,
int value, int minValue, int maxValue, int value, int minValue, int maxValue,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
@@ -62,27 +59,28 @@ class wxSlider: public wxControl
long style = wxSL_HORIZONTAL, long style = wxSL_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr ); const wxString& name = wxSliderNameStr );
virtual int GetValue(void) const; virtual int GetValue() const;
virtual void SetValue( int ); virtual void SetValue( int );
void SetRange( int minValue, int maxValue ); void SetRange( int minValue, int maxValue );
int GetMin(void) const; int GetMin() const;
int GetMax(void) 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; int GetPageSize() const;
void ClearSel(void); void ClearSel();
void ClearTicks(void); void ClearTicks();
void SetLineSize( int lineSize ); void SetLineSize( int lineSize );
int GetLineSize(void) const; int GetLineSize() const;
int GetSelEnd(void) const; int GetSelEnd() const;
int GetSelStart(void) const; int GetSelStart() const;
void SetSelection( int minPos, int maxPos ); void SetSelection( int minPos, int maxPos );
void SetThumbLength( int len ); 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 ); bool IsOwnGtkWindow( GdkWindow *window );
void ApplyWidgetStyle(); void ApplyWidgetStyle();
@@ -90,6 +88,8 @@ class wxSlider: public wxControl
GtkAdjustment *m_adjust; GtkAdjustment *m_adjust;
float m_oldPos; float m_oldPos;
private:
DECLARE_DYNAMIC_CLASS(wxSlider)
}; };
#endif #endif

View File

@@ -15,6 +15,12 @@
#pragma interface #pragma interface
#endif #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 #endif
// __GTKSPINBUTTH__ // __GTKSPINBUTTH__

View File

@@ -15,6 +15,12 @@
#pragma interface #pragma interface
#endif #endif
#include "wx/defs.h"
#if wxUSE_SPINCTRL
#include "wx/control.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxSpinCtrl // wxSpinCtrl
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -53,6 +59,8 @@ public:
virtual int GetMax() const; virtual int GetMax() const;
// implementation // implementation
// --------------
void OnChar( wxKeyEvent &event ); void OnChar( wxKeyEvent &event );
bool IsOwnGtkWindow( GdkWindow *window ); bool IsOwnGtkWindow( GdkWindow *window );
@@ -66,5 +74,8 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#endif
// wxUSE_SPINCTRL
#endif #endif
// __GTKSPINCTRLH__ // __GTKSPINCTRLH__