VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / motif / scrolbar.cpp

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 52ef32cc554021ffec4bc62730d65d956568bd37..f0f4440583c161a545b7e5762608dd545b991a20 100644 (file)
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,7 +20,7 @@
 #include <Xm/RowColumn.h>
 #include <Xm/ScrollBar.h>
 
 #include <Xm/RowColumn.h>
 #include <Xm/ScrollBar.h>
 

-#include <wx/motif/private.h>
+#include "wx/motif/private.h"

 
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                         XmScaleCallbackStruct *cbs);
 
 static void wxScrollBarCallback(Widget widget, XtPointer clientData,
                         XmScaleCallbackStruct *cbs);


@@ -43,13 +43,13 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     SetValidator(validator);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     SetValidator(validator);

-    
+

     m_windowStyle = style;
 
     if ( id == -1 )
     m_windowStyle = style;
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     int x = pos.x;
     int y = pos.y;
 
     int x = pos.x;
     int y = pos.y;


@@ -102,7 +102,7 @@ wxScrollBar::~wxScrollBar()
 {
 }
 
 {
 }
 

-void wxScrollBar::SetPosition(int pos)
+void wxScrollBar::SetThumbPosition(int pos)

 {
        if (m_mainWidget)
        {
 {
        if (m_mainWidget)
        {


@@ -112,7 +112,7 @@ void wxScrollBar::SetPosition(int pos)
        }
 }
 
        }
 }
 

-int wxScrollBar::GetPosition() const
+int wxScrollBar::GetThumbPosition() const

 {
        if (m_mainWidget)
        {
 {
        if (m_mainWidget)
        {


@@ -126,7 +126,7 @@ int wxScrollBar::GetPosition() const
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,

-    bool refresh)
+    bool WXUNUSED(refresh))

 {
     m_viewSize = pageSize;
     m_pageSize = thumbSize;
 {
     m_viewSize = pageSize;
     m_pageSize = thumbSize;


@@ -148,26 +148,31 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetPosition(event.m_commandInt);
+    SetThumbPosition(event.m_commandInt);

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

-void wxScrollBar::ChangeFont(bool keepOriginalSize)
+void wxScrollBar::ChangeFont(bool WXUNUSED(keepOriginalSize))

 {
     // TODO
 {
     // TODO

+    // Do anything for a scrollbar? A font will never be seen.

 }
 
 void wxScrollBar::ChangeBackgroundColour()
 {
 }
 
 void wxScrollBar::ChangeBackgroundColour()
 {

-    // TODO
+    wxWindow::ChangeBackgroundColour();
+
+    XtVaSetValues ((Widget) GetMainWidget(),
+        XmNtroughColor, m_backgroundColour.AllocColour(XtDisplay((Widget) GetMainWidget())),
+        NULL);

 }
 
 void wxScrollBar::ChangeForegroundColour()
 {
 }
 
 void wxScrollBar::ChangeForegroundColour()
 {

-    // TODO
+    wxWindow::ChangeForegroundColour();

 }
 
 }
 

-static void wxScrollBarCallback(Widget widget, XtPointer clientData,
+static void wxScrollBarCallback(Widget WXUNUSED(widget), XtPointer clientData,

                         XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar *)clientData;
                         XmScaleCallbackStruct *cbs)
 {
     wxScrollBar *scrollBar = (wxScrollBar *)clientData;