Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied (part of) the bitmap theme patch.

Browse Source 
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
This commit is contained in:
Robert Roebling
2003-06-23 15:00:16 +00:00
parent 7c79b1598f
commit b7f8adfd2d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/window.cpp
View File

@@ -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__

7
src/gtk1/window.cpp
View File

@@ -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__