BC++ 5.5 and later supports wxUSE_ON_FATAL_EXCEPTION

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

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 14b124335c4b723689d97cd59c295267460fc53b..3ab5970f78886f5886ba9726ab1b08967dd7e5a2 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -12,16 +12,12 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "scrolbar.h"
 #endif
 
 #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)
         


@@ -49,7 +45,7 @@ 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; }

-    
+

     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
         bool refresh = TRUE);
     virtual void SetThumbPosition(int viewStart);
     virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
         bool refresh = TRUE);


@@ -59,7 +55,6 @@ public:
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();

-    virtual void ChangeForegroundColour();

     
 protected:
     int m_pageSize;
     
 protected:
     int m_pageSize;