From 73b30256a0a232b42a494e43e797640df6e5a0b3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 9 Dec 2006 14:52:59 +0000 Subject: [PATCH] default name of wxStaticLine should be wxStaticLineNameStr, not wxStaticTextNameStr git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/statline.h | 4 ++-- include/wx/generic/statline.h | 4 ++-- include/wx/gtk/statline.h | 4 ++-- include/wx/gtk1/statline.h | 4 ++-- include/wx/mac/carbon/statline.h | 4 ++-- include/wx/mac/classic/statline.h | 4 ++-- include/wx/msw/statline.h | 4 ++-- include/wx/os2/private.h | 1 + include/wx/os2/statline.h | 4 ++-- include/wx/palmos/statline.h | 4 ++-- include/wx/statline.h | 5 ++--- include/wx/univ/statline.h | 4 ++-- src/common/datacmn.cpp | 1 + 13 files changed, 24 insertions(+), 23 deletions(-) diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h index c470309216..add9a4c091 100644 --- a/include/wx/cocoa/statline.h +++ b/include/wx/cocoa/statline.h @@ -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(); // ------------------------------------------------------------------------ diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h index aadf1250b2..ae1ce7aa00 100644 --- a/include/wx/generic/statline.h +++ b/include/wx/generic/statline.h @@ -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 diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h index cbf7870042..b71bd696e2 100644 --- a/include/wx/gtk/statline.h +++ b/include/wx/gtk/statline.h @@ -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); diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h index a0d212b692..36609247f0 100644 --- a/include/wx/gtk1/statline.h +++ b/include/wx/gtk1/statline.h @@ -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); diff --git a/include/wx/mac/carbon/statline.h b/include/wx/mac/carbon/statline.h index 7a70d0d582..53e95d1084 100644 --- a/include/wx/mac/carbon/statline.h +++ b/include/wx/mac/carbon/statline.h @@ -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 diff --git a/include/wx/mac/classic/statline.h b/include/wx/mac/classic/statline.h index 7a70d0d582..53e95d1084 100644 --- a/include/wx/mac/classic/statline.h +++ b/include/wx/mac/classic/statline.h @@ -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 diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h index 48ba88254d..c69656ecab 100644 --- a/include/wx/msw/statline.h +++ b/include/wx/msw/statline.h @@ -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; } diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h index b64b64e50b..f4e7e99454 100644 --- a/include/wx/os2/private.h +++ b/include/wx/os2/private.h @@ -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[]; diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h index 83382c7105..76625e51ca 100644 --- a/include/wx/os2/statline.h +++ b/include/wx/os2/statline.h @@ -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); } diff --git a/include/wx/palmos/statline.h b/include/wx/palmos/statline.h index 6d74fcb78b..3101682bea 100644 --- a/include/wx/palmos/statline.h +++ b/include/wx/palmos/statline.h @@ -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; } diff --git a/include/wx/statline.h b/include/wx/statline.h index 905bb3152f..6b43415c84 100644 --- a/include/wx/statline.h +++ b/include/wx/statline.h @@ -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_ diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h index 6b6af3c56d..0711fc5b08 100644 --- a/include/wx/univ/statline.h +++ b/include/wx/univ/statline.h @@ -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); diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp index 6adf343f3a..fdc0a9a740 100644 --- a/src/common/datacmn.cpp +++ b/src/common/datacmn.cpp @@ -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"); -- 2.47.2