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

default name of wxStaticLine should be wxStaticLineNameStr, not wxStaticTextNameStr

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-12-09 14:52:59 +00:00
parent 23c06cde5d
commit 73b30256a0
13 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ public:
wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxStaticTextNameStr)
long style = 0, const wxString& name = wxStaticLineNameStr)
{
Create(parent, winid, pos, size, style, name);
}
@@ -38,7 +38,7 @@ public:
bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxStaticTextNameStr);
long style = 0, const wxString& name = wxStaticLineNameStr);
virtual ~wxStaticLine();
// ------------------------------------------------------------------------

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

@@ -30,7 +30,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
{
Create(parent, id, pos, size, style, name);
}
@@ -42,7 +42,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
// it's necessary to override this wxWindow function because we
// will want to return the main widget for m_statbox

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

@@ -27,13 +27,13 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
const wxString &name = wxStaticLineNameStr);
bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
const wxString &name = wxStaticLineNameStr);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

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

@@ -27,13 +27,13 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
const wxString &name = wxStaticLineNameStr);
bool Create(wxWindow *parent,
wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr);
const wxString &name = wxStaticLineNameStr);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

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

@@ -28,7 +28,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
: m_statbox(NULL)
{
Create(parent, id, pos, size, style, name);
@@ -39,7 +39,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
// it's necessary to override this wxWindow function because we
// will want to return the main widget for m_statbox

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

@@ -28,7 +28,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
: m_statbox(NULL)
{
Create(parent, id, pos, size, style, name);
@@ -39,7 +39,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
// it's necessary to override this wxWindow function because we
// will want to return the main widget for m_statbox

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

@@ -26,7 +26,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
{
Create(parent, id, pos, size, style, name);
}
@@ -36,7 +36,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
// overriden base class virtuals
virtual bool AcceptsFocus() const { return false; }

1
include/wx/os2/private.h
View File

@@ -103,6 +103,7 @@ WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxGaugeNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxStaticBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxListBoxNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxStaticLineNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxStaticTextNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxStaticBitmapNameStr[];
WXDLLEXPORT_DATA(extern const wxChar) wxPanelNameStr[];

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

@@ -26,7 +26,7 @@ public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxLI_HORIZONTAL
,const wxString& rsName = wxStaticTextNameStr
,const wxString& rsName = wxStaticLineNameStr
)
{
Create(pParent, vId, rPos, rSize, lStyle, rsName);
@@ -37,7 +37,7 @@ public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxLI_HORIZONTAL
,const wxString& rsName = wxStaticTextNameStr
,const wxString& rsName = wxStaticLineNameStr
);
inline bool IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }

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

@@ -27,7 +27,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
{
Create(parent, id, pos, size, style, name);
}
@@ -37,7 +37,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }

5
include/wx/statline.h
View File

@@ -28,7 +28,7 @@
// ----------------------------------------------------------------------------
// the default name for objects of class wxStaticLine
extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[];
// ----------------------------------------------------------------------------
// wxStaticLine - a line in a dialog
@@ -100,5 +100,4 @@ protected:
#endif // wxUSE_STATLINE
#endif
// _WX_STATLINE_H_BASE_
#endif // _WX_STATLINE_H_BASE_

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

@@ -33,7 +33,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr )
const wxString &name = wxStaticLineNameStr )
{
Create(parent, id, pos, size, style, name);
}
@@ -43,7 +43,7 @@ public:
const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticTextNameStr );
const wxString &name = wxStaticLineNameStr );
protected:
virtual void DoDraw(wxControlRenderer *renderer);

1
src/common/datacmn.cpp
View File

@@ -46,6 +46,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[] = wxT("staticLine");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook");