Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-11-27 20:28:25 +00:00
parent 0e0d88570a
commit aa9a4ae1a5
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/gtk/slider.h
View File

@@ -41,7 +41,7 @@ extern const char *wxSliderNameStr;
class wxSlider: public wxControl class wxSlider: public wxControl
{ {
public: public:
wxSlider() {} 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,
@@ -52,12 +52,13 @@ public:
{ {
Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name ); Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
} }
~wxSlider();
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,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
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() const; virtual int GetValue() const;
virtual void SetValue( int ); virtual void SetValue( int );
@@ -79,15 +80,15 @@ public:
int GetThumbLength() 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();
GtkAdjustment *m_adjust; GtkAdjustment *m_adjust;
float m_oldPos; float m_oldPos;
private: private:
DECLARE_DYNAMIC_CLASS(wxSlider) DECLARE_DYNAMIC_CLASS(wxSlider)
}; };

13
include/wx/gtk1/slider.h
View File

@@ -41,7 +41,7 @@ extern const char *wxSliderNameStr;
class wxSlider: public wxControl class wxSlider: public wxControl
{ {
public: public:
wxSlider() {} 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,
@@ -52,12 +52,13 @@ public:
{ {
Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name ); Create( parent, id, value, minValue, maxValue, pos, size, style, validator, name );
} }
~wxSlider();
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,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
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() const; virtual int GetValue() const;
virtual void SetValue( int ); virtual void SetValue( int );
@@ -79,15 +80,15 @@ public:
int GetThumbLength() 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();
GtkAdjustment *m_adjust; GtkAdjustment *m_adjust;
float m_oldPos; float m_oldPos;
private: private:
DECLARE_DYNAMIC_CLASS(wxSlider) DECLARE_DYNAMIC_CLASS(wxSlider)
}; };