first attempt for full screen implementation

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

diff --git a/src/motif/slider.cpp b/src/motif/slider.cpp
index 756d5fa5807a94ca34ef3c6b19054e5632382852..e11f1bb9ceb0146f805369b98800f332c8d7bec2 100644 (file)
--- a/src/motif/slider.cpp
+++ b/src/motif/slider.cpp
@@ -9,29 +9,36 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/slider.h"
 #include "wx/utils.h"
 
 #include "wx/slider.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Scale.h>
 #include <Xm/Xm.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Scale.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 

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

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

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()

-#endif

 
 
 
 
 
 


@@ -42,7 +49,6 @@ wxSlider::wxSlider()
     m_lineSize = 1;
     m_rangeMax = 0;
     m_rangeMin = 0;
     m_lineSize = 1;
     m_rangeMax = 0;
     m_rangeMin = 0;

-    m_tickFreq = 0;

 }
 
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,


@@ -51,25 +57,15 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
                       const wxSize& size, long style,
                       const wxValidator& validator,
                       const wxString& name)
                       const wxSize& size, long style,
                       const wxValidator& validator,
                       const wxString& name)

-{    
+{

     if ( !((style & wxSL_HORIZONTAL) || (style & wxSL_VERTICAL)) )
          style |= wxSL_HORIZONTAL;
     if ( !((style & wxSL_HORIZONTAL) || (style & wxSL_VERTICAL)) )
          style |= wxSL_HORIZONTAL;

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

 
 

-    if (parent) parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;

 
     m_lineSize = 1;
     m_windowStyle = style;
 
     m_lineSize = 1;
     m_windowStyle = style;

-    m_tickFreq = 0;
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;

 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;
 
     m_rangeMax = maxValue;
     m_rangeMin = minValue;


@@ -93,19 +89,24 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_mainWidget = (WXWidget) sliderWidget;
 
 
     m_mainWidget = (WXWidget) sliderWidget;
 

+#ifdef __VMS__
+#pragma message disable codcauunr
+   // VMS gives here the compiler warning :
+   // statement either is unreachable or causes unreachable code
+#endif

     if(style & wxSL_NOTIFY_DRAG)
         XtAddCallback (sliderWidget, XmNdragCallback,
         (XtCallbackProc) wxSliderCallback, (XtPointer) this);
     else
         XtAddCallback (sliderWidget, XmNvalueChangedCallback,
         (XtCallbackProc) wxSliderCallback, (XtPointer) this);
     if(style & wxSL_NOTIFY_DRAG)
         XtAddCallback (sliderWidget, XmNdragCallback,
         (XtCallbackProc) wxSliderCallback, (XtPointer) this);
     else
         XtAddCallback (sliderWidget, XmNvalueChangedCallback,
         (XtCallbackProc) wxSliderCallback, (XtPointer) this);

+#ifdef __VMS__
+#pragma message enable codcauunr
+#endif

 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 
 
     XtAddCallback (sliderWidget, XmNdragCallback, (XtCallbackProc) wxSliderCallback, (XtPointer) this);
 

-    m_font = parent->GetFont();
-

     ChangeFont(FALSE);
     ChangeFont(FALSE);

-    SetCanAddEventHandler(TRUE);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();


@@ -129,11 +130,6 @@ void wxSlider::SetValue(int value)
     XtVaSetValues ((Widget) m_mainWidget, XmNvalue, value, NULL);
 }
 
     XtVaSetValues ((Widget) m_mainWidget, XmNvalue, value, NULL);
 }
 

-void wxSlider::GetSize(int *width, int *height) const
-{
-    wxControl::GetSize(width, height);
-}
-

 void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     Widget widget = (Widget) m_mainWidget;
 void wxSlider::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     Widget widget = (Widget) m_mainWidget;


@@ -174,12 +170,6 @@ void wxSlider::SetRange(int minValue, int maxValue)
 }
 
 // For trackbars only
 }
 
 // For trackbars only

-void wxSlider::SetTickFreq(int n, int pos)
-{
-    // Not implemented in Motif
-    m_tickFreq = n;
-}
-

 void wxSlider::SetPageSize(int pageSize)
 {
     // Not implemented in Motif
 void wxSlider::SetPageSize(int pageSize)
 {
     // Not implemented in Motif


@@ -191,16 +181,6 @@ int wxSlider::GetPageSize() const
     return m_pageSize;
 }
 
     return m_pageSize;
 }
 

-void wxSlider::ClearSel()
-{
-    // Not implemented in Motif
-}
-
-void wxSlider::ClearTicks()
-{
-    // Not implemented in Motif
-}
-

 void wxSlider::SetLineSize(int lineSize)
 {
     // Not implemented in Motif
 void wxSlider::SetLineSize(int lineSize)
 {
     // Not implemented in Motif


@@ -213,23 +193,6 @@ int wxSlider::GetLineSize() const
     return m_lineSize;
 }
 
     return m_lineSize;
 }
 

-int wxSlider::GetSelEnd() const
-{
-    // Not implemented in Motif
-    return 0;
-}
-
-int wxSlider::GetSelStart() const
-{
-    // Not implemented in Motif
-    return 0;
-}
-
-void wxSlider::SetSelection(int WXUNUSED(minPos), int WXUNUSED(maxPos))
-{
-    // Not implemented in Motif
-}
-

 void wxSlider::SetThumbLength(int WXUNUSED(len))
 {
     // Not implemented in Motif (?)
 void wxSlider::SetThumbLength(int WXUNUSED(len))
 {
     // Not implemented in Motif (?)


@@ -241,56 +204,41 @@ int wxSlider::GetThumbLength() const
     return 0;
 }
 
     return 0;
 }
 

-void wxSlider::SetTick(int WXUNUSED(tickPos))
-{
-    // Not implemented in Motif
-}
-

 void wxSlider::Command (wxCommandEvent & event)
 {
     SetValue (event.GetInt());
     ProcessCommand (event);
 }
 
 void wxSlider::Command (wxCommandEvent & event)
 {
     SetValue (event.GetInt());
     ProcessCommand (event);
 }
 

-void wxSlider::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
-void wxSlider::ChangeBackgroundColour()
-{
-    wxWindow::ChangeBackgroundColour();
-}
-
-void wxSlider::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-
-void wxSliderCallback (Widget widget, XtPointer clientData, XmScaleCallbackStruct * cbs)
+void wxSliderCallback (Widget widget, XtPointer clientData,
+                       XmScaleCallbackStruct * cbs)

 {
     wxSlider *slider = (wxSlider *) clientData;
 {
     wxSlider *slider = (wxSlider *) clientData;

+    wxEventType scrollEvent;
+

     switch (cbs->reason)
     {
     case XmCR_VALUE_CHANGED:
     switch (cbs->reason)
     {
     case XmCR_VALUE_CHANGED:

+        scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+        break;
+

     case XmCR_DRAG:
     case XmCR_DRAG:

+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        break;
+

     default:
     default:

-        {
-            // TODO: the XmCR_VALUE_CHANGED case should be handled
-            // differently (it's not sent continually as the slider moves).
-            // In which case we need a similar behaviour for other platforms.
-
-            wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, slider->GetId());
-            XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
-            event.SetEventObject(slider);
-            slider->ProcessCommand(event);
-
-            // Also send a wxCommandEvent for compatibility.
-            wxCommandEvent event2(wxEVT_COMMAND_SLIDER_UPDATED, slider->GetId());
-            event2.SetEventObject(slider);
-            slider->ProcessCommand(event2);
-            break;
-        }
+        return;

     }
     }

+
+    wxScrollEvent event(scrollEvent, slider->GetId());
+    XtVaGetValues (widget, XmNvalue, &event.m_commandInt, NULL);
+    event.SetEventObject(slider);
+    slider->GetEventHandler()->ProcessEvent(event);
+
+    // Also send a wxCommandEvent for compatibility.
+    wxCommandEvent event2(wxEVT_COMMAND_SLIDER_UPDATED, slider->GetId());
+    event2.SetEventObject(slider);
+    event2.SetInt( event.GetInt() );
+    slider->GetEventHandler()->ProcessEvent(event2);

 }
 
 }