?jl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,7 +41,8 @@ extern const char *wxScrollBarNameStr;
|
|||||||
class wxScrollBar: public wxControl
|
class wxScrollBar: public wxControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
|
wxScrollBar()
|
||||||
|
{ m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }
|
||||||
inline wxScrollBar( wxWindow *parent, wxWindowID id,
|
inline wxScrollBar( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@@ -49,7 +50,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxScrollBarNameStr )
|
const wxString& name = wxScrollBarNameStr )
|
||||||
{
|
{
|
||||||
Create( parent, id, pos, size, style, validator, name );
|
Create( parent, id, pos, size, style, validator, name );
|
||||||
}
|
}
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@@ -57,8 +58,8 @@ public:
|
|||||||
long style = wxSB_HORIZONTAL,
|
long style = wxSB_HORIZONTAL,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxScrollBarNameStr );
|
const wxString& name = wxScrollBarNameStr );
|
||||||
~wxScrollBar(void);
|
~wxScrollBar();
|
||||||
int GetThumbPosition(void) const;
|
int GetThumbPosition() const;
|
||||||
int GetThumbSize() const;
|
int GetThumbSize() const;
|
||||||
int GetPageSize() const;
|
int GetPageSize() const;
|
||||||
int GetRange() const;
|
int GetRange() const;
|
||||||
|
@@ -41,7 +41,8 @@ extern const char *wxScrollBarNameStr;
|
|||||||
class wxScrollBar: public wxControl
|
class wxScrollBar: public wxControl
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxScrollBar(void) { m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; };
|
wxScrollBar()
|
||||||
|
{ m_adjust = (GtkAdjustment *) NULL; m_oldPos = 0.0; }
|
||||||
inline wxScrollBar( wxWindow *parent, wxWindowID id,
|
inline wxScrollBar( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
@@ -49,7 +50,7 @@ public:
|
|||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxScrollBarNameStr )
|
const wxString& name = wxScrollBarNameStr )
|
||||||
{
|
{
|
||||||
Create( parent, id, pos, size, style, validator, name );
|
Create( parent, id, pos, size, style, validator, name );
|
||||||
}
|
}
|
||||||
bool Create( wxWindow *parent, wxWindowID id,
|
bool Create( wxWindow *parent, wxWindowID id,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
@@ -57,8 +58,8 @@ public:
|
|||||||
long style = wxSB_HORIZONTAL,
|
long style = wxSB_HORIZONTAL,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxScrollBarNameStr );
|
const wxString& name = wxScrollBarNameStr );
|
||||||
~wxScrollBar(void);
|
~wxScrollBar();
|
||||||
int GetThumbPosition(void) const;
|
int GetThumbPosition() const;
|
||||||
int GetThumbSize() const;
|
int GetThumbSize() const;
|
||||||
int GetPageSize() const;
|
int GetPageSize() const;
|
||||||
int GetRange() const;
|
int GetRange() const;
|
||||||
|
@@ -45,7 +45,7 @@ while test $# -gt 0; do
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
includes="$includes -I@libdir@/wx/include"
|
includes="$includes -I@libdir@/wx/include"
|
||||||
echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@
|
echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@
|
||||||
;;
|
;;
|
||||||
--libs)
|
--libs)
|
||||||
if test @libdir@ != /usr/lib ; then
|
if test @libdir@ != /usr/lib ; then
|
||||||
|
Reference in New Issue
Block a user