cleanup for 10.5

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 90d718db89d29417af1f5c77dc785f3932460d44..26b1bc06295b99b71bf985de13018df7fdb8633a 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -15,13 +15,12 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/image.h"
+    #include "wx/colour.h"

 #endif // WX_PRECOMP
 
 #include "wx/gtk/private.h" //for idle stuff
 
 #endif // WX_PRECOMP
 
 #include "wx/gtk/private.h" //for idle stuff
 

-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-

 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------


@@ -31,7 +30,7 @@ class wxCursorRefData: public wxObjectRefData
   public:
 
     wxCursorRefData();
   public:
 
     wxCursorRefData();

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

 
     GdkCursor *m_cursor;
 };
 
     GdkCursor *m_cursor;
 };


@@ -88,7 +87,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_ARROWWAIT:
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_ARROWWAIT:
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;

-        case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;
+        case wxCURSOR_SIZING:           gdk_cur = GDK_FLEUR; break;

         case wxCURSOR_SPRAYCAN:         gdk_cur = GDK_SPRAYCAN; break;
         case wxCURSOR_IBEAM:            gdk_cur = GDK_XTERM; break;
         case wxCURSOR_PENCIL:           gdk_cur = GDK_PENCIL; break;
         case wxCURSOR_SPRAYCAN:         gdk_cur = GDK_SPRAYCAN; break;
         case wxCURSOR_IBEAM:            gdk_cur = GDK_XTERM; break;
         case wxCURSOR_PENCIL:           gdk_cur = GDK_PENCIL; break;


@@ -144,12 +143,7 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
 
     m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
 
     m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(

-                 data, mask,
-#if GTK_CHECK_VERSION(2, 6, 0)
-                 fg->GetColor(), bg->GetColor(),
-#else
-                 wx_const_cast(GdkColor*, fg->GetColor()), wx_const_cast(GdkColor*, bg->GetColor()),
-#endif
+                 data, mask, fg->GetColor(), bg->GetColor(),

                  hotSpotX, hotSpotY );
 
     g_object_unref (data);
                  hotSpotX, hotSpotY );
 
     g_object_unref (data);


@@ -300,11 +294,7 @@ wxCursor::wxCursor( const wxImage & image )
                              (
                                 data,
                                 mask,
                              (
                                 data,
                                 mask,

-#if GTK_CHECK_VERSION(2, 6, 0)

                                 fg.GetColor(), bg.GetColor(),
                                 fg.GetColor(), bg.GetColor(),

-#else
-                                wx_const_cast(GdkColor*, fg.GetColor()), wx_const_cast(GdkColor*, bg.GetColor()),
-#endif

                                 hotSpotX, hotSpotY
                              );
 
                                 hotSpotX, hotSpotY
                              );
 


@@ -330,7 +320,7 @@ bool wxCursor::operator != ( const wxCursor& cursor ) const
     return m_refData != cursor.m_refData;
 }
 
     return m_refData != cursor.m_refData;
 }
 

-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const

 {
     return (m_refData != NULL);
 }
 {
     return (m_refData != NULL);
 }