Added userData to wxSizerItems and other things to make sizers more

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

diff --git a/include/wx/motif/scrolbar.h b/include/wx/motif/scrolbar.h
index 60a09c34ab49cff97817b0653b095bc994522f30..2cda645071787d675855b5269a14546a29cdcde8 100644 (file)
--- a/include/wx/motif/scrolbar.h
+++ b/include/wx/motif/scrolbar.h
@@ -45,19 +45,19 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxScrollBarNameStr);
 

-  int GetPosition() const ;
+  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 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 SetThumbPosition(int viewStart);

   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
 
 // Implementation
   virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
 
 // Implementation

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

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


@@ -66,7 +66,7 @@ protected:
     int m_viewSize;
     int m_objectSize;
 
     int m_viewSize;
     int m_objectSize;
 

-DECLARE_EVENT_TABLE()
+// DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif