diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h index ddccb240da..612c37afae 100644 --- a/include/wx/gtk/scrolbar.h +++ b/include/wx/gtk/scrolbar.h @@ -41,7 +41,8 @@ extern const char *wxScrollBarNameStr; class wxScrollBar: public wxControl { 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, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -49,7 +50,7 @@ public: const wxValidator& validator = wxDefaultValidator, 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, const wxPoint& pos = wxDefaultPosition, @@ -57,8 +58,8 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(void); - int GetThumbPosition(void) const; + ~wxScrollBar(); + int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; int GetRange() const; diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h index ddccb240da..612c37afae 100644 --- a/include/wx/gtk1/scrolbar.h +++ b/include/wx/gtk1/scrolbar.h @@ -41,7 +41,8 @@ extern const char *wxScrollBarNameStr; class wxScrollBar: public wxControl { 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, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -49,7 +50,7 @@ public: const wxValidator& validator = wxDefaultValidator, 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, const wxPoint& pos = wxDefaultPosition, @@ -57,8 +58,8 @@ public: long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxScrollBarNameStr ); - ~wxScrollBar(void); - int GetThumbPosition(void) const; + ~wxScrollBar(); + int GetThumbPosition() const; int GetThumbSize() const; int GetPageSize() const; int GetRange() const; diff --git a/wx-config.in b/wx-config.in index 6c0f4262a8..16ad73e222 100755 --- a/wx-config.in +++ b/wx-config.in @@ -45,7 +45,7 @@ while test $# -gt 0; do fi fi includes="$includes -I@libdir@/wx/include" - echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ @TOOLKIT_INCLUDE@ + echo $includes @WXDEBUG_DEFINE@ @TOOLKIT_DEF@ ;; --libs) if test @libdir@ != /usr/lib ; then