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

diff --git a/include/wx/cocoa/statline.h b/include/wx/cocoa/statline.h
index c470309216c6a870ee44fdbe4c4971372f423f17..add9a4c091e103bae96f3f98877bc896902296f0 100644 (file)
--- 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 aadf1250b2646efe37e186b68e0dbeed6cb31ec9..ae1ce7aa0083fbdfc1c2ec8f96ed83e43b08ca16 100644 (file)
--- 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 cbf78700424771c6cda173178542c3b0de04a672..b71bd696e2dac8f4cf4a7780799e45fd7eb4b4f9 100644 (file)
--- 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 a0d212b6929b31c1522a9be673eb29804b16f11e..36609247f0bb4d986dc9a3ff7fd7b709779443cd 100644 (file)
--- 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 7a70d0d5820f3e8b4eef35cff823f99f3ab82889..53e95d10841a3cd91f0e3fad02752fd36d83dd20 100644 (file)
--- 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 7a70d0d5820f3e8b4eef35cff823f99f3ab82889..53e95d10841a3cd91f0e3fad02752fd36d83dd20 100644 (file)
--- 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 48ba88254d1117a92aa3fe7f3ea6807b6d75997b..c69656ecabecf2dc4c0cd095ad4e2a45cacb6a77 100644 (file)
--- 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 b64b64e50b331b77136ad051e2cdb23e2706cb0b..f4e7e994547fc37288c53af7720180d1e846cc7f 100644 (file)
--- 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 83382c71051a1f9b942f155a79b8a22af475aa74..76625e51ca8b1d743048fef5a14524e8b86515ea 100644 (file)
--- 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 6d74fcb78bc94206066ec79c75deb35826f41c7a..3101682bea841447fa781de0d427fac148f34a07 100644 (file)
--- 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 905bb3152f7b5de236c1483b4885d3001936baa0..6b43415c84115c71b4bc7578f5d9b1d643d12659 100644 (file)
--- 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 6b6af3c56dc5d91408a691bce209389365c16f24..0711fc5b08e1b2372b18bcb620fa01293d87485b 100644 (file)
--- 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 6adf343f3a06076e8329129447c345c7f4ce88f7..fdc0a9a7408034b567463d841d9f321b921934e2 100644 (file)
--- 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");