corrected handling of timeouts in wxConditionInternal::WaitTimeout(): check for wxSEM...

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

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 954c21795f77c70d1bce02e5ef2c04d0d39a7106..7cccf770251a335cfa9e03f21d82597586d19678 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -12,14 +12,8 @@
 #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"
-

 // Scrollbar item
 // Scrollbar item

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

 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
         
 {
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
         


@@ -47,18 +41,16 @@ public:
     inline int GetThumbSize() const { return m_pageSize; }
     inline int GetPageSize() const { return m_viewSize; }
     inline int GetRange() const { return m_objectSize; }
     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);
     
     // Implementation
     
     void Command(wxCommandEvent& event);
     
     // 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;
     
 protected:
     int m_pageSize;