[ 1498016 ] 'Add wxUniv toolbar support wxTB_TEXT style' - with modifications.

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 7c431b8efa8b2b762fa66feb348272aed9057e7c..d02105ec8b92d052e6cce486cf6cd6b792df50a9 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.cpp
+// Name:        src/gtk/cursor.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,8 +11,11 @@
 #include "wx/wxprec.h"
 
 #include "wx/cursor.h"
 #include "wx/wxprec.h"
 
 #include "wx/cursor.h"

-#include "wx/utils.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif // WX_PRECOMP

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


@@ -144,8 +147,8 @@ wxCursor::wxCursor(const char bits[], int width, int  height,
                  data, mask, fg->GetColor(), bg->GetColor(),
                  hotSpotX, hotSpotY );
 
                  data, mask, fg->GetColor(), bg->GetColor(),
                  hotSpotX, hotSpotY );
 

-    g_object_unref (G_OBJECT (data));
-    g_object_unref (G_OBJECT (mask));
+    g_object_unref (data);
+    g_object_unref (mask);

 }
 
 #if wxUSE_IMAGE
 }
 
 #if wxUSE_IMAGE


@@ -296,8 +299,8 @@ wxCursor::wxCursor( const wxImage & image )
                                 hotSpotX, hotSpotY
                              );
 
                                 hotSpotX, hotSpotY
                              );
 

-    g_object_unref (G_OBJECT (data));
-    g_object_unref (G_OBJECT (mask));
+    g_object_unref (data);
+    g_object_unref (mask);

     delete [] bits;
     delete [] maskBits;
 }
     delete [] bits;
     delete [] maskBits;
 }