Theme fix for Mac

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

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 3c274df7b37c17a15c4bfb92d1d978bea4c6dbb6..cee6f8abb3a340a631dc00030603e94e7f1b7712 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -1,34 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        scrollbar.h
+// Name:        wx/motif/scrollbar.h

 // Purpose:     wxScrollBar class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxScrollBar class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "scrolbar.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
-

 // Scrollbar item
 // Scrollbar item

-class WXDLLEXPORT wxScrollBar: public wxControl
+class WXDLLEXPORT wxScrollBar: public wxScrollBarBase

 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)

-        
+

 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,
         const wxSize& size = wxDefaultSize,
     inline wxScrollBar(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -44,24 +36,22 @@ public:
         long style = wxSB_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxScrollBarNameStr);
         long style = wxSB_HORIZONTAL,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxScrollBarNameStr);

-    
+

     int GetThumbPosition() const ;
     inline int GetThumbSize() const { return m_pageSize; }
     inline int GetPageSize() const { return m_viewSize; }
     inline int GetRange() const { return m_objectSize; }
     int GetThumbPosition() const ;
     inline int GetThumbSize() const { return m_pageSize; }
     inline int GetPageSize() const { return m_viewSize; }
     inline int GetRange() const { return m_objectSize; }

-    inline bool IsVertical() const { return FALSE; }

 
     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
 
     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,

-        bool refresh = TRUE);
-    
+        bool refresh = true);
+

     void Command(wxCommandEvent& event);
     void Command(wxCommandEvent& event);

-    
+

     // Implementation
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeBackgroundColour();

-    virtual void ChangeForegroundColour();
-    
+

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