implement wxNativeFontInfo::SetFamily for wxGTK with the same logic used by wxMSW...

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

diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h
index 8a2d72c3c0022210d98bd7c4b5a789b8a06c49e1..025767d981cbdd3421935beb6d946959f1aea83e 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
 {


@@ -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.


@@ -157,10 +157,9 @@ public:
     */
     bool Create(wxWindow* parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
     */
     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 wxValidator& validator = wxDefaultValidator,

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

 
     /**
         Returns the page size of the scrollbar.
 
     /**
         Returns the page size of the scrollbar.