X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4876436a6240109da0b947c4333b75eb98525d70..f1b08e84a191caaa975569e0cac89658058c7730:/interface/wx/scrolbar.h

diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h
index 913132d224..8e08dc967e 100644
--- a/interface/wx/scrolbar.h
+++ b/interface/wx/scrolbar.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxScrollBar
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -39,7 +39,7 @@
            Specifies a vertical scrollbar.
     @endStyleTable
 
-    @beginEventTable{wxScrollEvent}
+    @beginEventEmissionTable{wxScrollEvent}
     You can use EVT_COMMAND_SCROLL... macros with window IDs for when intercepting
     scroll events from controls, or EVT_SCROLL... macros without window IDs for
     intercepting scroll events from the receiving window -- except for this,
@@ -105,9 +105,9 @@
 
     @library{wxcore}
     @category{ctrl}
-    <!-- @appearance{scrollbar.png} -->
+    @appearance{scrollbar.png}
 
-    @see @ref overview_scrolling, @ref overview_eventhandling, wxScrolled
+    @see @ref overview_scrolling, @ref overview_events, wxScrolled
 */
 class wxScrollBar : public wxControl
 {
@@ -125,11 +125,11 @@ 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
-            Window size. If wxDefaultSize is specified then a default size
-        is chosen.
+            Window size. 
+            If ::wxDefaultSize is specified then a default size is chosen.
         @param style
             Window style. See wxScrollBar.
         @param validator
@@ -144,7 +144,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "scrollBar");
+                const wxString& name = wxScrollBarNameStr);
 
     /**
         Destructor, destroying the scrollbar.
@@ -157,10 +157,9 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSB_HORIZONTAL,
+                const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "scrollBar");
+                const wxString& name = wxScrollBarNameStr);
 
     /**
         Returns the page size of the scrollbar.