Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / statline.h

diff --git a/interface/wx/statline.h b/interface/wx/statline.h
index 745e1aeb2129af59d6ece5fc31a42198bd0c5b03..91ef6c68a18e8269f1b5cdb5e44976d77653b707 100644 (file)
--- a/interface/wx/statline.h
+++ b/interface/wx/statline.h
@@ -2,8 +2,7 @@
 // Name:        statline.h
 // Purpose:     interface of wxStaticLine
 // Author:      wxWidgets team
 // Name:        statline.h
 // Purpose:     interface of wxStaticLine
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -14,7 +13,7 @@
 
     The line may be only vertical or horizontal. Moreover, not all ports
     (notably not wxGTK) support specifying the transversal direction of the
 
     The line may be only vertical or horizontal. Moreover, not all ports
     (notably not wxGTK) support specifying the transversal direction of the

-    line (e.g. height for a horizontal line) so for maximial portability you
+    line (e.g. height for a horizontal line) so for maximal portability you

     should specify it as wxDefaultCoord.
 
     @beginStyleTable
     should specify it as wxDefaultCoord.
 
     @beginStyleTable


@@ -46,7 +45,7 @@ public:
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
             Window position.
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
             Window position.

-            If wxDefaultPosition is specified then a default position is chosen.
+            If ::wxDefaultPosition is specified then a default position is chosen.

         @param size
             Size. Note that either the height or the width (depending on
             whether the line if horizontal or vertical) is ignored.
         @param size
             Size. Note that either the height or the width (depending on
             whether the line if horizontal or vertical) is ignored.


@@ -61,7 +60,7 @@ public:
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,

-                 const wxString& name = "staticLine");
+                 const wxString& name = wxStaticLineNameStr);

 
     /**
         Creates the static line for two-step construction.
 
     /**
         Creates the static line for two-step construction.


@@ -69,9 +68,8 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,
     */
     bool Create(wxWindow* parent, wxWindowID id = wxID_ANY,
                 const wxPoint& pos = wxDefaultPosition,

-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = "staticLine");
+                const wxSize& size = wxDefaultSize, long style = wxLI_HORIZONTAL,
+                const wxString& name = wxStaticLineNameStr);

 
     /**
         This static function returns the size which will be given to the smaller
 
     /**
         This static function returns the size which will be given to the smaller