moved wxDash typedef to gdicmn.h

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 47acb2a6f0dfff662599e35bc82e86a5ebf22f10..7b0c2ad4334dafaace26fcaead1df9d11b6cdd49 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -35,8 +35,9 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool        g_blockEventsOnDrag;
+extern bool        g_blockEventsOnScroll;
+extern GtkWidget  *wxRootWindow;

 
 //-----------------------------------------------------------------------------
 // local functions
 
 //-----------------------------------------------------------------------------
 // local functions


@@ -87,19 +88,17 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
     {
         GdkGC *gc = gdk_gc_new( pizza->bin_window );
         GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
     {
         GdkGC *gc = gdk_gc_new( pizza->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( pizza->bin_window, gc, TRUE, 
         
         gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
         gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

-                            x, 

                             3, 
                             3, 

-                            win->m_width - 4 - x,
+                            3, 
+                            win->m_width - 7,

                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
         gdk_draw_string( pizza->bin_window, font, gc, 
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
         gdk_draw_string( pizza->bin_window, font, gc, 

-                         x+2, 
+                         6, 

                          3+font->ascent, 
                          win->m_title.mb_str() );
         
                          3+font->ascent, 
                          win->m_title.mb_str() );
         


@@ -133,19 +132,17 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
     {
         GdkGC *gc = gdk_gc_new( pizza->bin_window );
         GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
     {
         GdkGC *gc = gdk_gc_new( pizza->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( pizza->bin_window, gc, TRUE, 
         
         gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
         gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

-                            x, 

                             3, 
                             3, 

-                            win->m_width - 4 - x,
+                            3,
+                            win->m_width - 7,

                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
         gdk_draw_string( pizza->bin_window, font, gc, 
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
         gdk_draw_string( pizza->bin_window, font, gc, 

-                         x+2, 
+                         6, 

                          3+font->ascent, 
                          win->m_title.mb_str() );
         
                          3+font->ascent, 
                          win->m_title.mb_str() );
         


@@ -179,7 +176,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,

-                      GDK_CURRENT_TIME );
+                      (unsigned int) GDK_CURRENT_TIME );

                      
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;
                      
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;


@@ -212,7 +209,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
     int y = (int)gdk_event->y;
     
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
     int y = (int)gdk_event->y;
     
     DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );

-    gdk_pointer_ungrab ( GDK_CURRENT_TIME );
+    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );

     int org_x = 0;    
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     int org_x = 0;    
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );


@@ -273,6 +270,33 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 

+static char *cross_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"5 5 16 1",
+"  c Gray0",
+". c #bf0000",
+"X c #00bf00",
+"o c #bfbf00",
+"O c #0000bf",
+"+ c #bf00bf",
+"@ c #00bfbf",
+"# c None",
+"$ c #808080",
+"% c Red",
+"& c Green",
+"* c Yellow",
+"= c Blue",
+"- c Magenta",
+"; c Cyan",
+": c Gray100",
+/* pixels */
+" ### ",
+"# # #",
+"## ##",
+"# # #",
+" ### ",
+};
+

 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,


@@ -294,14 +318,26 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
     
     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)))
     {
     if ((style & wxSYSTEM_MENU) &&
         ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
     {

-        GtkWidget *close_button = gtk_button_new_with_label( "x" );
+        GdkBitmap *mask = (GdkBitmap*) NULL;
+        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 );
+        gdk_pixmap_unref( pixmap );
+        gtk_widget_show( pw );
+    
+        GtkWidget *close_button = gtk_button_new();
+        gtk_container_add( GTK_CONTAINER(close_button), pw );

     
         gtk_pizza_put( GTK_PIZZA(m_mainWidget), 
                          close_button, 
     
         gtk_pizza_put( GTK_PIZZA(m_mainWidget), 
                          close_button, 

-                         4, 4, 12, 11 );
+                         size.x-16, 4, 11, 11 );

     
         gtk_widget_show( close_button );
     
     
         gtk_widget_show( close_button );