A few tweaks and cleanups

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

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 95343b50ca430ca89150e5251018d392f45499ad..14b124335c4b723689d97cd59c295267460fc53b 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -23,46 +23,49 @@ WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
 {
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
+    DECLARE_DYNAMIC_CLASS(wxScrollBar)
+        

 public:
 public:

-  inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-  ~wxScrollBar();
-
-  inline wxScrollBar(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSB_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr)
-  {
-      Create(parent, id, pos, size, style, validator, name);
-  }
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxSB_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxScrollBarNameStr);
-
-  int GetPosition() const ;
-  inline int GetThumbSize() const { return m_pageSize; }
-  inline int GetPageSize() const { return m_viewSize; }
-  inline int GetRange() const { return m_objectSize; }
-
-  virtual void SetPosition(int viewStart);
-  virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
-    bool refresh = TRUE);
-
-  void Command(wxCommandEvent& event);
-
+    inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
+    ~wxScrollBar();
+    
+    inline wxScrollBar(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        long style = wxSB_HORIZONTAL,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxScrollBarNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        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; }
+    
+    virtual void SetThumbPosition(int viewStart);
+    virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
+        bool refresh = TRUE);
+    
+    void Command(wxCommandEvent& event);
+    
+    // Implementation
+    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeBackgroundColour();
+    virtual void ChangeForegroundColour();
+    

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

-
-DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif

-    // _WX_SCROLBAR_H_
+// _WX_SCROLBAR_H_