OS/2 fixes

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

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index bdcc5ef8a99f2e61c266e8969a07e48a72f057a2..ec6f44a3c596223985783bd175e8e2ff85fd73b5 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -35,8 +35,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool        g_blockEventsOnDrag;
+extern bool        g_blockEventsOnScroll;
+extern GtkWidget  *wxRootWindow;
 
 //-----------------------------------------------------------------------------
 // local functions
@@ -95,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, 
@@ -139,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, 
@@ -302,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;
@@ -321,8 +321,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
         ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
     {
         GdkBitmap *mask = (GdkBitmap*) NULL;
-        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
-        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, cross_xpm );
+        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm );
     
         GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
         gdk_bitmap_unref( mask );