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

use correct background color when drawing borders

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-10-10 15:51:09 +00:00
parent 4c493e0bc5
commit 830910cc28
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@@ -321,10 +321,8 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
int h = win->m_wxwindow->allocation.height; int h = win->m_wxwindow->allocation.height;
if (win->HasFlag(wxBORDER_SIMPLE)) if (win->HasFlag(wxBORDER_SIMPLE))
{ {
GdkGC* gc = gdk_gc_new(gdk_event->window); gdk_draw_rectangle(gdk_event->window,
gdk_gc_set_foreground(gc, &widget->style->black); widget->style->black_gc, false, x, y, w - 1, h - 1);
gdk_draw_rectangle(gdk_event->window, gc, false, x, y, w - 1, h - 1);
g_object_unref(gc);
} }
else else
{ {
@@ -341,10 +339,9 @@ expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
// for scrollable ones // for scrollable ones
detail = "viewport"; detail = "viewport";
GtkWidget* styleWidget = wxGTKPrivate::GetEntryWidget();
gtk_paint_shadow( gtk_paint_shadow(
styleWidget->style, gdk_event->window, GTK_STATE_NORMAL, win->m_wxwindow->style, gdk_event->window, GTK_STATE_NORMAL,
shadow, NULL, styleWidget, detail, x, y, w, h); shadow, NULL, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h);
} }
// no further painting is needed for border-only GdkWindow // no further painting is needed for border-only GdkWindow