drawing optimization fix

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

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index 84fa92fe64f9fd644ecc97ad1d280af696263e84..10b670d40019b9a1d440bc8886bc4d429bb7e29c 100644 (file)
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -22,7 +22,7 @@
 
 #include <wx/motif/private.h>
 
 
 #include <wx/motif/private.h>
 

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

                         XmScaleCallbackStruct *cbs);
 
 #if !USE_SHARED_LIBRARY
                         XmScaleCallbackStruct *cbs);
 
 #if !USE_SHARED_LIBRARY


@@ -40,7 +40,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
         return FALSE;
     parent->AddChild(this);
     SetName(name);
         return FALSE;
     parent->AddChild(this);
     SetName(name);

-       SetValidator(validator);
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    SetValidator(validator);

     
     m_windowStyle = style;
 
     
     m_windowStyle = style;
 


@@ -91,7 +93,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);

-    ChangeColour(m_mainWidget);
+    ChangeBackgroundColour();

 
     return TRUE;
 }
 
     return TRUE;
 }


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

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

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


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

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

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


@@ -150,7 +152,22 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

-void wxScrollBarCallback(Widget widget, XtPointer clientData,
+void wxScrollBar::ChangeFont(bool keepOriginalSize)
+{
+    // TODO
+}
+
+void wxScrollBar::ChangeBackgroundColour()
+{
+    // TODO
+}
+
+void wxScrollBar::ChangeForegroundColour()
+{
+    // TODO
+}
+
+static void wxScrollBarCallback(Widget widget, XtPointer clientData,

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