fix for longlongHash for architectures where sizeof(long long) == sizeof(long)

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9f3a829aef33294d95f3cf4d1cef1c63b912e0d2..08942c4548d84c739c872f167501c12f9b9c6b3d 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -32,10 +32,9 @@
     #include "wx/layout.h"
     #include "wx/statusbr.h"
     #include "wx/math.h"
     #include "wx/layout.h"
     #include "wx/statusbr.h"
     #include "wx/math.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"
-

 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 #endif


@@ -2932,13 +2931,11 @@ void wxWindowGTK::OnInternalIdle()
                 gdk_window_set_cursor( window, cursor.GetCursor() );
 
         }
                 gdk_window_set_cursor( window, cursor.GetCursor() );
 
         }

-        else
+        else if ( m_widget )

         {
         {

-

             GdkWindow *window = m_widget->window;
             GdkWindow *window = m_widget->window;

-            if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
+            if ( window && !GTK_WIDGET_NO_WINDOW(m_widget) )

                gdk_window_set_cursor( window, cursor.GetCursor() );
                gdk_window_set_cursor( window, cursor.GetCursor() );

-

         }
     }
 
         }
     }
 


@@ -3415,16 +3412,14 @@ bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 {
     wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
 
 {
     wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
 

-    if (cursor == m_cursor)
+    if ( cursor.IsSameAs(m_cursor) )

        return false;
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 
        return false;
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    if (cursor == wxNullCursor)
-       return wxWindowBase::SetCursor( *wxSTANDARD_CURSOR );
-    else
-       return wxWindowBase::SetCursor( cursor );
+    return wxWindowBase::SetCursor( cursor.IsOk() ? cursor
+                                                  : *wxSTANDARD_CURSOR );

 }
 
 void wxWindowGTK::WarpPointer( int x, int y )
 }
 
 void wxWindowGTK::WarpPointer( int x, int y )