From b7f8adfd2d1fd21ee8ed75701e773c163b157d55 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Mon, 23 Jun 2003 15:00:16 +0000 Subject: [PATCH] Applied (part of) the bitmap theme patch. Didn't find the static text alignment problem. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 7 ++++--- src/gtk1/window.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index dc090b9114..d133b4bcce 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -851,6 +851,7 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) break; case GDK_KP_Left: + // wxPrintf( wxT("Left\n") ); key_code = isChar ? WXK_LEFT : WXK_NUMPAD_LEFT; break; @@ -1995,7 +1996,7 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - + // Event was emitted after an ungrab if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; @@ -2210,10 +2211,10 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); - if (win->m_delayedBackgroundColour) + if (win->m_delayedBackgroundColour && !win->GetThemeEnabled()) win->GtkSetBackgroundColour( win->GetBackgroundColour() ); - if (win->m_delayedForegroundColour) + if (win->m_delayedForegroundColour && !win->GetThemeEnabled()) win->GtkSetForegroundColour( win->GetForegroundColour() ); #ifdef __WXGTK20__ diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index dc090b9114..d133b4bcce 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -851,6 +851,7 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) break; case GDK_KP_Left: + // wxPrintf( wxT("Left\n") ); key_code = isChar ? WXK_LEFT : WXK_NUMPAD_LEFT; break; @@ -1995,7 +1996,7 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return FALSE; - + // Event was emitted after an ungrab if (gdk_event->mode != GDK_CROSSING_NORMAL) return FALSE; @@ -2210,10 +2211,10 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); - if (win->m_delayedBackgroundColour) + if (win->m_delayedBackgroundColour && !win->GetThemeEnabled()) win->GtkSetBackgroundColour( win->GetBackgroundColour() ); - if (win->m_delayedForegroundColour) + if (win->m_delayedForegroundColour && !win->GetThemeEnabled()) win->GtkSetForegroundColour( win->GetForegroundColour() ); #ifdef __WXGTK20__