Add wxHAS_BITMAPTOGGLEBUTTON and test for it in the unit test.

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

diff --git a/interface/wx/statline.h b/interface/wx/statline.h
index 1c8069ebdd494dc2a8313b577e7b9b1a45848b20..0a4ba0536d9cf0a1b0fe4fe4e1971b0c01db63aa 100644 (file)
--- a/interface/wx/statline.h
+++ b/interface/wx/statline.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxStaticLine
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -25,7 +25,7 @@
     @endStyleTable
 
     @library{wxcore}
-    @category{FIXME}
+    @category{ctrl}
 
     @see wxStaticBox
 */
@@ -36,7 +36,7 @@ public:
       Default constructor
     */
     wxStaticLine();
-    
+
     /**
         Constructor, creating and showing a static line.
 
@@ -45,8 +45,8 @@ public:
         @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.
@@ -61,17 +61,16 @@ public:
                  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,
-                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