Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / src / x11 / cursor.cpp

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 03d92bd6506e093b28c905cbf960539f7a620e74..b8f7e4aa31c8fd6d1f7723046c4a696a7aa64733 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,6 +18,7 @@
     #include "wx/utils.h"
     #include "wx/icon.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
     #include "wx/icon.h"
     #include "wx/gdicmn.h"

+    #include "wx/image.h"

 #endif
 
 #include "wx/x11/private.h"
 #endif
 
 #include "wx/x11/private.h"


@@ -31,15 +31,20 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData: public wxGDIRefData

 {
 public:
 
     wxCursorRefData();
 {
 public:
 
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();

 
     WXCursor     m_cursor;
     WXDisplay   *m_display;
 
     WXCursor     m_cursor;
     WXDisplay   *m_display;

+
+private:
+    // There is no way to copy m_cursor so we can't implement a copy ctor
+    // properly.
+    wxDECLARE_NO_COPY_CLASS(wxCursorRefData);

 };
 
 wxCursorRefData::wxCursorRefData()
 };
 
 wxCursorRefData::wxCursorRefData()


@@ -65,7 +70,7 @@ wxCursor::wxCursor()
 
 }
 
 
 }
 

-wxCursor::wxCursor( int cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )

 {
     m_refData = new wxCursorRefData();
 
 {
     m_refData = new wxCursorRefData();
 


@@ -123,15 +128,15 @@ wxCursor::wxCursor( int cursorId )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const char bits[], int width, int  height,
-                   int hotSpotX, int hotSpotY,
-                   const char maskBits[], wxColour *fg, wxColour *bg)
+wxCursor::wxCursor(const wxString& WXUNUSED(name),
+                    wxBitmapType WXUNUSED(type),
+                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))

 {
 {

-   wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
+   wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") );

 }
 
 #if wxUSE_IMAGE
 }
 
 #if wxUSE_IMAGE

-wxCursor::wxCursor( const wxImage & image )
+wxCursor::wxCursor( const wxImage & WXUNUSED(image) )

 {
    wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
 }
 {
    wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
 }


@@ -141,19 +146,17 @@ wxCursor::~wxCursor()
 {
 }
 
 {
 }
 

-bool wxCursor::operator == ( const wxCursor& cursor ) const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
 {

-    return m_refData == cursor.m_refData;
+    return new wxCursorRefData;

 }
 
 }
 

-bool wxCursor::operator != ( const wxCursor& cursor ) const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return m_refData != cursor.m_refData;
-}
+    wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxX11.") );

 
 

-bool wxCursor::Ok() const
-{
-    return (m_refData != NULL);
+    return new wxCursorRefData;

 }
 
 WXCursor wxCursor::GetCursor() const
 }
 
 WXCursor wxCursor::GetCursor() const


@@ -197,7 +200,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
     if (gs_busyCount++ > 0)
         return;
 
     if (gs_busyCount++ > 0)
         return;
 

-    wxASSERT_MSG( !gs_savedCursor.Ok(),
+    wxASSERT_MSG( !gs_savedCursor.IsOk(),

                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;