Corrected frame.cpp to recognise wxNO_BORDER properly

[wxWidgets.git] / src / gtk1 / minifram.cpp

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index 49de6bc0955f43dd33123374ad207a8cddf60acf..ec6f44a3c596223985783bd175e8e2ff85fd73b5 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/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)))
     {