X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..a3e7d24d21f5371c88caffe4a85c8e4a5362db3f:/src/gtk1/minifram.cpp diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 9da9393c89..a59e05cd8d 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -71,8 +71,10 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g if (!win->m_hasVMT) return; if (gdk_event->count > 0) return; + GtkMyFixed *myfixed = GTK_MYFIXED(widget); + gtk_draw_shadow( widget->style, - widget->window, + myfixed->bin_window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, 0, 0, @@ -83,20 +85,20 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( widget->window ); + GdkGC *gc = gdk_gc_new( myfixed->bin_window ); GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); int x = 2; if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 18; gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, + gdk_draw_rectangle( myfixed->bin_window, gc, TRUE, x, 3, win->m_width - 4 - x, font->ascent + font->descent+1 ); gdk_gc_set_foreground( gc, &widget->style->white ); - gdk_draw_string( widget->window, font, gc, + gdk_draw_string( myfixed->bin_window, font, gc, x+2, 3+font->ascent, win->m_title.mb_str() ); @@ -115,8 +117,10 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU if (!win->m_hasVMT) return; + GtkMyFixed *myfixed = GTK_MYFIXED(widget); + gtk_draw_shadow( widget->style, - widget->window, + myfixed->bin_window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, 0, 0, @@ -127,20 +131,20 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( widget->window ); + GdkGC *gc = gdk_gc_new( myfixed->bin_window ); GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); int x = 2; if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 17; gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, + gdk_draw_rectangle( myfixed->bin_window, gc, TRUE, x, 3, win->m_width - 4 - x, font->ascent + font->descent+1 ); gdk_gc_set_foreground( gc, &widget->style->white ); - gdk_draw_string( widget->window, font, gc, + gdk_draw_string( myfixed->bin_window, font, gc, x+2, 3+font->ascent, win->m_title.mb_str() );