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

gave default value of wxID_ANY to id parameter of wxStaticLine ctor as nobody uses anything else for it anyhow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-11 02:13:30 +00:00
parent e72ac08291
commit 1de1196ab3
11 changed files with 76 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/statline.tex
View File

@@ -34,7 +34,7 @@ groups of controls. The line may be only vertical or horizontal.
Default constructor. Default constructor.
\func{}{wxStaticLine}{\param{wxWindow* }{parent}, \param{wxWindowID }{id},\rtfsp \func{}{wxStaticLine}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY},\rtfsp
\param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
\param{long}{ style = wxLI\_HORIZONTAL}, \param{const wxString\& }{name = ``staticLine"}} \param{long}{ style = wxLI\_HORIZONTAL}, \param{const wxString\& }{name = ``staticLine"}}
@@ -61,7 +61,7 @@ whether the line if horizontal or vertical) is ignored.}
\membersection{wxStaticLine::Create}\label{wxstaticlinecreate} \membersection{wxStaticLine::Create}\label{wxstaticlinecreate}
\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id},\rtfsp \func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id = wxID\_ANY},\rtfsp
\param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
\param{long}{ style = 0}, \param{const wxString\& }{name = ``staticLine"}} \param{long}{ style = 0}, \param{const wxString\& }{name = ``staticLine"}}

4
include/wx/cocoa/statline.h
View File

@@ -27,7 +27,7 @@ class WXDLLEXPORT wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSB
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
public: public:
wxStaticLine() { } wxStaticLine() { }
wxStaticLine(wxWindow *parent, wxWindowID winid, wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxStaticTextNameStr) long style = 0, const wxString& name = wxStaticTextNameStr)
@@ -35,7 +35,7 @@ public:
Create(parent, winid, pos, size, style, name); Create(parent, winid, pos, size, style, name);
} }
bool Create(wxWindow *parent, wxWindowID winid, bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxStaticTextNameStr); long style = 0, const wxString& name = wxStaticTextNameStr);

4
include/wx/generic/statline.h
View File

@@ -30,7 +30,7 @@ public:
wxStaticLine() { m_statbox = NULL; } wxStaticLine() { m_statbox = NULL; }
wxStaticLine( wxWindow *parent, wxStaticLine( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -42,7 +42,7 @@ public:
virtual ~wxStaticLine(); virtual ~wxStaticLine();
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,

48
include/wx/gtk/statline.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: statline.h // Name: wx/gtk/statline.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -12,47 +12,43 @@
#define __GTKSTATICLINEH__ #define __GTKSTATICLINEH__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface #pragma interface "statline.h"
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_STATLINE #if wxUSE_STATLINE
#include "wx/object.h" // ----------------------------------------------------------------------------
#include "wx/list.h"
#include "wx/control.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxStaticLine;
//-----------------------------------------------------------------------------
// wxStaticLine // wxStaticLine
//----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxStaticLine : public wxStaticLineBase class wxStaticLine : public wxStaticLineBase
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLine)
public: public:
wxStaticLine(); wxStaticLine();
wxStaticLine( wxWindow *parent, wxWindowID id, wxStaticLine(wxWindow *parent,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, wxWindowID id = wxID_ANY,
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ); const wxPoint &pos = wxDefaultPosition,
bool Create( wxWindow *parent, wxWindowID id, const wxSize& size = wxDefaultSize,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL,
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr);
bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private:
DECLARE_DYNAMIC_CLASS(wxStaticLine)
}; };
#endif #endif // wxUSE_STATLINE
// wxUSE_STATLINE
#endif // __GTKSTATICLINEH__
#endif
// __GTKSTATICLINEH__

48
include/wx/gtk1/statline.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: statline.h // Name: wx/gtk/statline.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@@ -12,47 +12,43 @@
#define __GTKSTATICLINEH__ #define __GTKSTATICLINEH__
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface #pragma interface "statline.h"
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
#if wxUSE_STATLINE #if wxUSE_STATLINE
#include "wx/object.h" // ----------------------------------------------------------------------------
#include "wx/list.h"
#include "wx/control.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxStaticLine;
//-----------------------------------------------------------------------------
// wxStaticLine // wxStaticLine
//----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class wxStaticLine : public wxStaticLineBase class wxStaticLine : public wxStaticLineBase
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLine)
public: public:
wxStaticLine(); wxStaticLine();
wxStaticLine( wxWindow *parent, wxWindowID id, wxStaticLine(wxWindow *parent,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, wxWindowID id = wxID_ANY,
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ); const wxPoint &pos = wxDefaultPosition,
bool Create( wxWindow *parent, wxWindowID id, const wxSize& size = wxDefaultSize,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLI_HORIZONTAL,
long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr);
bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private:
DECLARE_DYNAMIC_CLASS(wxStaticLine)
}; };
#endif #endif // wxUSE_STATLINE
// wxUSE_STATLINE
#endif // __GTKSTATICLINEH__
#endif
// __GTKSTATICLINEH__

8
include/wx/mac/carbon/statline.h
View File

@@ -23,14 +23,12 @@ class wxStaticBox;
class WXDLLEXPORT wxStaticLine : public wxStaticLineBase class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLine)
public: public:
// constructors and pseudo-constructors // constructors and pseudo-constructors
wxStaticLine() : m_statbox(NULL) { } wxStaticLine() : m_statbox(NULL) { }
wxStaticLine( wxWindow *parent, wxStaticLine( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -41,7 +39,7 @@ public:
} }
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -55,6 +53,8 @@ public:
protected: protected:
// we implement the static line using a static box // we implement the static line using a static box
wxStaticBox *m_statbox; wxStaticBox *m_statbox;
DECLARE_DYNAMIC_CLASS(wxStaticLine)
}; };
#endif // _WX_GENERIC_STATLINE_H_ #endif // _WX_GENERIC_STATLINE_H_

8
include/wx/mac/classic/statline.h
View File

@@ -23,14 +23,12 @@ class wxStaticBox;
class WXDLLEXPORT wxStaticLine : public wxStaticLineBase class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
{ {
DECLARE_DYNAMIC_CLASS(wxStaticLine)
public: public:
// constructors and pseudo-constructors // constructors and pseudo-constructors
wxStaticLine() : m_statbox(NULL) { } wxStaticLine() : m_statbox(NULL) { }
wxStaticLine( wxWindow *parent, wxStaticLine( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -41,7 +39,7 @@ public:
} }
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -55,6 +53,8 @@ public:
protected: protected:
// we implement the static line using a static box // we implement the static line using a static box
wxStaticBox *m_statbox; wxStaticBox *m_statbox;
DECLARE_DYNAMIC_CLASS(wxStaticLine)
}; };
#endif // _WX_GENERIC_STATLINE_H_ #endif // _WX_GENERIC_STATLINE_H_

12
include/wx/msw/statline.h
View File

@@ -26,9 +26,9 @@ public:
wxStaticLine() { } wxStaticLine() { }
wxStaticLine( wxWindow *parent, wxStaticLine( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr ) const wxString &name = wxStaticTextNameStr )
{ {
@@ -36,9 +36,9 @@ public:
} }
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr ); const wxString &name = wxStaticTextNameStr );

4
include/wx/os2/statline.h
View File

@@ -26,7 +26,7 @@ public:
// constructors and pseudo-constructors // constructors and pseudo-constructors
wxStaticLine() { } wxStaticLine() { }
wxStaticLine( wxWindow* pParent wxStaticLine( wxWindow* pParent
,wxWindowID vId ,wxWindowID vId = wxID_ANY
,const wxPoint& rPos = wxDefaultPosition ,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize ,const wxSize& rSize = wxDefaultSize
,long lStyle = wxLI_HORIZONTAL ,long lStyle = wxLI_HORIZONTAL
@@ -37,7 +37,7 @@ public:
} }
bool Create( wxWindow* pParent bool Create( wxWindow* pParent
,wxWindowID vId ,wxWindowID vId = wxID_ANY
,const wxPoint& rPos = wxDefaultPosition ,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize ,const wxSize& rSize = wxDefaultSize
,long lStyle = wxLI_HORIZONTAL ,long lStyle = wxLI_HORIZONTAL

4
include/wx/palmos/statline.h
View File

@@ -27,7 +27,7 @@ public:
wxStaticLine() { } wxStaticLine() { }
wxStaticLine( wxWindow *parent, wxStaticLine( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -37,7 +37,7 @@ public:
} }
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,

4
include/wx/univ/statline.h
View File

@@ -33,7 +33,7 @@ public:
} }
wxStaticLine(wxWindow *parent, wxStaticLine(wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,
@@ -43,7 +43,7 @@ public:
} }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id = wxID_ANY,
const wxPoint &pos = wxDefaultPosition, const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize, const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL, long style = wxLI_HORIZONTAL,