undo the last change as it results in buildbot configuration error

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

diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h
index 03c651bf30a52efe6d451187a389fb2648b6a439..39e1b97a89fd6f48a67fdb1858ea471b334a7424 100644 (file)
--- a/interface/wx/scrolbar.h
+++ b/interface/wx/scrolbar.h
@@ -39,7 +39,7 @@
            Specifies a vertical scrollbar.
     @endStyleTable
 
            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,
     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,


@@ -107,7 +107,7 @@
     @category{ctrl}
     @appearance{scrollbar.png}
 
     @category{ctrl}
     @appearance{scrollbar.png}
 

-    @see @ref overview_scrolling, @ref overview_eventhandling, wxScrolled
+    @see @ref overview_scrolling, @ref overview_events, wxScrolled

 */
 class wxScrollBar : public wxControl
 {
 */
 class wxScrollBar : public wxControl
 {


@@ -125,11 +125,11 @@ 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
         @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
         @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 wxSize& size = wxDefaultSize,
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "scrollBar");
+                const wxString& name = wxScrollBarNameStr);

 
     /**
         Destructor, destroying the scrollbar.
 
     /**
         Destructor, destroying the scrollbar.