an assert added to check that we're not doing something stupid

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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 6ac1773a14c92ce5d002ae3454063b4cfcec98f9..c70a812f99d05b67551951937f5fa1bb72accc05 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -634,7 +634,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
     /* wxMSW doesn't send char events with Alt pressed */
     if ((key_code != 0) &&
         ((gdk_event->state & GDK_MOD1_MASK) == 0) &&
-        ((gdk_event->state & GDK_MOD1_MASK) == 0))
+        ((gdk_event->state & GDK_MOD2_MASK) == 0))
     {
         wxKeyEvent event2( wxEVT_CHAR );                 
         event2.SetTimestamp( gdk_event->time );
@@ -2069,7 +2069,7 @@ void wxWindow::OnInternalIdle()
             wxCursor cursor = m_cursor;
             if (g_globalCursor.Ok()) cursor = g_globalCursor;
        
-           if (m_currentGdkCursor != cursor)
+           if (cursor.Ok() && m_currentGdkCursor != cursor)
            {
                gdk_window_set_cursor( window, cursor.GetCursor() );
                m_currentGdkCursor = cursor;