X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8185521695af751c39e16b7bce9370c4f82bc9a5..28be2e8a170979d476a5ea4f585505b8a2f5af27:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 49de6bc095..ec6f44a3c5 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -96,7 +96,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g win->m_width - 7, font->ascent + font->descent+1 ); - gdk_gc_set_foreground( gc, &widget->style->white ); + gdk_gc_set_foreground( gc, &widget->style->fg[GTK_STATE_SELECTED] ); gdk_draw_string( pizza->bin_window, font, gc, 6, 3+font->ascent, @@ -140,7 +140,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU win->m_width - 7, font->ascent + font->descent+1 ); - gdk_gc_set_foreground( gc, &widget->style->white ); + gdk_gc_set_foreground( gc, &widget->style->fg[GTK_STATE_SELECTED] ); gdk_draw_string( pizza->bin_window, font, gc, 6, 3+font->ascent, @@ -303,8 +303,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { -// style = style | wxSIMPLE_BORDER; - style = style | wxCAPTION; + style = style | wxCAPTION | wxFRAME_FLOAT_ON_PARENT; if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) m_miniTitle = 13; @@ -318,9 +317,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title wxFrame::Create( parent, id, title, pos, size, style, name ); - if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget))) - gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); - if ((style & wxSYSTEM_MENU) && ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) {