don't do anything in SetWindowMenu() if we're setting the same menu as we already...

[wxWidgets.git] / include / wx / cocoa / scrolbar.h

diff --git a/include/wx/cocoa/scrolbar.h b/include/wx/cocoa/scrolbar.h
index 2eb0c0a8d356197f70f178ffc27bd1a5dfec5f09..7d449fe2aa2338a6f915b9e8f82dd51d8a60331f 100644 (file)
--- a/include/wx/cocoa/scrolbar.h
+++ b/include/wx/cocoa/scrolbar.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/25
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
 // Created:     2004/04/25
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_SCROLBAR_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_SCROLBAR_H__


@@ -17,7 +17,7 @@
 // ========================================================================
 // wxScrollBar
 // ========================================================================
 // ========================================================================
 // wxScrollBar
 // ========================================================================

-class WXDLLEXPORT wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller
+class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller

 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
     DECLARE_EVENT_TABLE()
 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
     DECLARE_EVENT_TABLE()


@@ -30,7 +30,7 @@ public:
     wxScrollBar(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     wxScrollBar(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxSL_HORIZONTAL,
+            long style = wxSB_HORIZONTAL,

             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxScrollBarNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxScrollBarNameStr)
     {


@@ -40,7 +40,7 @@ public:
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,

-            long style = wxSL_HORIZONTAL,
+            long style = wxSB_HORIZONTAL,

             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxScrollBarNameStr);
     virtual ~wxScrollBar();
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxScrollBarNameStr);
     virtual ~wxScrollBar();


@@ -71,4 +71,5 @@ protected:
     int m_pageSize;
 };
 
     int m_pageSize;
 };
 

-#endif // _WX_COCOA_SCROLBAR_H__
+#endif
+    // _WX_COCOA_SCROLBAR_H__