fixes to menu stock items support (patch 1547639)

[wxWidgets.git] / include / wx / mac / carbon / scrolbar.h

diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index 633b615cedf9cd55268a53d1c1cfd376aa2f1116..cabbeb9dc39d4b6f3c3d92a9910de1cc9a8a0061 100644 (file)
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -12,13 +12,9 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "scrolbar.h"
-#endif
-

 #include "wx/control.h"
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];

 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl


@@ -27,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl
 
 public:
   inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
 
 public:
   inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }

-  ~wxScrollBar();
+  virtual ~wxScrollBar();

 
   inline wxScrollBar(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   inline wxScrollBar(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -57,8 +53,11 @@ public:
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);

-        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual void  MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ;

 
 

+    wxSize DoGetBestSize() const;
+    

 protected:
     int m_pageSize;
     int m_viewSize;
 protected:
     int m_pageSize;
     int m_viewSize;