remove ancient defines left over from GTK1

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

diff --git a/interface/wx/statline.h b/interface/wx/statline.h
index e68fa8311bf90b79f348b6e971ca53a68ae91779..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


@@ -25,7 +24,7 @@
     @endStyleTable
 
     @library{wxcore}
     @endStyleTable
 
     @library{wxcore}

-    @category{FIXME}
+    @category{ctrl}

 
     @see wxStaticBox
 */
 
     @see wxStaticBox
 */


@@ -36,7 +35,7 @@ public:
       Default constructor
     */
     wxStaticLine();
       Default constructor
     */
     wxStaticLine();

-    
+

     /**
         Constructor, creating and showing a static line.
 
     /**
         Constructor, creating and showing a static line.
 


@@ -45,8 +44,8 @@ public:
         @param id
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos
         @param id
             Window identifier. The value wxID_ANY indicates a default value.
         @param pos

-            Window position. If wxDefaultPosition is specified then a default
-        position is chosen.
+            Window position.
+            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,24 +60,23 @@ 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. See wxStaticLine()
-        for further details.
+        Creates the static line for two-step construction.
+        See wxStaticLine() for further details.

     */
     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
         dimension of the static line, i.e. its height for a horizontal line or its
         width for a vertical one.
     */
 
     /**
         This static function returns the size which will be given to the smaller
         dimension of the static line, i.e. its height for a horizontal line or its
         width for a vertical one.
     */

-    int GetDefaultSize();
+    static int GetDefaultSize();

 
     /**
         Returns @true if the line is vertical, @false if horizontal.
 
     /**
         Returns @true if the line is vertical, @false if horizontal.