Do not derive wxCursor from wxBitmap, plus misc cleanup.

Derive wxGauge from wxGaugeBase, use XmScale for the
implementation if the Motif version supports the
XmTHERMOMETER style.
  Derive wxSlider from wxSliderBase; generate
wxEVT_SCROLL_THUMBRELEASE in addition to wxEVT_SCROLL_THUMBTRACK;
misc cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/motif/cursor.h

@@ -16,38 +16,13 @@
 #pragma interface "cursor.h"
 #endif
 
-#include "wx/bitmap.h"
-#include "wx/list.h"
+#include "wx/object.h"
+#include "wx/gdicmn.h"
 
-/* Cursor for one display, so we can choose the correct one for
-* the current display.
-*/
-class wxXCursor : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxXCursor)
-        
-public:
-    WXDisplay*  m_display;
-    WXCursor    m_cursor;
-};
-
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData();
-    ~wxCursorRefData();
-    
-    wxList        m_cursors;  // wxXCursor objects, one per display
-    wxStockCursor m_cursorId; // wxWindows standard cursor id
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+class WXDLLEXPORT wxImage;
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLEXPORT wxCursor: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxCursor)
         
@@ -70,15 +45,19 @@ public:
     wxCursor(wxStockCursor id);
     ~wxCursor();
     
-    virtual bool Ok() const { return ((m_refData != NULL) && M_CURSORDATA->m_ok); }
-    
-    wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-    bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
-    bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
+    virtual bool Ok() const;
     
+    wxCursor& operator = (const wxCursor& cursor)
+        { if (*this == cursor) return (*this); Ref(cursor); return *this; }
+    bool operator == (const wxCursor& cursor) const
+        { return m_refData == cursor.m_refData; }
+    bool operator != (const wxCursor& cursor) const
+        { return m_refData != cursor.m_refData; }
+
     // Motif-specific.
     // Create/get a cursor for the current display
     WXCursor GetXCursor(WXDisplay* display) ;
+private:
     // Make a cursor from standard id
     WXCursor MakeCursor(WXDisplay* display, wxStockCursor id);
 };

include/wx/motif/gauge.h

@@ -16,12 +16,10 @@
 #pragma interface "gauge.h"
 #endif
 
-#include "wx/control.h"
-
 WXDLLEXPORT_DATA(extern const char*) wxGaugeNameStr;
 
 // Group box
-class WXDLLEXPORT wxGauge : public wxControl
+class WXDLLEXPORT wxGauge : public wxGaugeBase
 {
     DECLARE_DYNAMIC_CLASS(wxGauge)
         
@@ -48,25 +46,18 @@ public:
         const wxString& name = wxGaugeNameStr);
     
     void SetShadowWidth(int w);
-    void SetBezelFace(int w);
     void SetRange(int r);
     void SetValue(int pos);
     
     int GetShadowWidth() const ;
-    int GetBezelFace() const ;
     int GetRange() const ;
     int GetValue() const ;
     
     virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
-    
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    
-protected:
-    int      m_rangeMax;
-    int      m_gaugePos;
+
+private:
+    virtual wxSize DoGetBestSize() const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
 };
 
 #endif

include/wx/motif/slider.h

@@ -21,7 +21,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 
 // Slider
-class WXDLLEXPORT wxSlider: public wxControl
+class WXDLLEXPORT wxSlider: public wxSliderBase
 {
     DECLARE_DYNAMIC_CLASS(wxSlider)
         
@@ -52,42 +52,26 @@ public:
     virtual int GetValue() const ;
     virtual void SetValue(int);
     
-    void GetSize(int *x, int *y) const ;
-    
     void SetRange(int minValue, int maxValue);
     
     inline int GetMin() const { return m_rangeMin; }
     inline int GetMax() const { return m_rangeMax; }
     
     // For trackbars only
-    void SetTickFreq(int n, int pos);
-    inline int GetTickFreq() const { return m_tickFreq; }
     void SetPageSize(int pageSize);
     int GetPageSize() const ;
-    void ClearSel() ;
-    void ClearTicks() ;
     void SetLineSize(int lineSize);
     int GetLineSize() const ;
-    int GetSelEnd() const ;
-    int GetSelStart() const ;
-    void SetSelection(int minPos, int maxPos);
     void SetThumbLength(int len) ;
     int GetThumbLength() const ;
-    void SetTick(int tickPos) ;
     
     void Command(wxCommandEvent& event);
     
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    
 protected:
     int           m_rangeMin;
     int           m_rangeMax;
     int           m_pageSize;
     int           m_lineSize;
-    int           m_tickFreq;
     
     virtual void DoSetSize(int x, int y,
         int width, int height,