wxFileSystem now compiles if wxUSE_HTML (required by wxHTML)

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

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index 9fa95cf91801c92effd3f79ef8f852924cf92a7b..bdcc5ef8a99f2e61c266e8969a07e48a72f057a2 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -20,9 +20,9 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -71,10 +71,10 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
     
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
     

-    GtkMyFixed *myfixed = GTK_MYFIXED(widget);
+    GtkPizza *pizza = GTK_PIZZA(widget);

     
     gtk_draw_shadow( widget->style, 
     
     gtk_draw_shadow( widget->style, 

-                     myfixed->bin_window,
+                     pizza->bin_window,

                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,
                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,


@@ -85,21 +85,19 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {

-        GdkGC *gc = gdk_gc_new( myfixed->bin_window );
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );

         GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
         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_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );

-        gdk_draw_rectangle( myfixed->bin_window, gc, TRUE, 
-                            x, 
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

                             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 );
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );

-        gdk_draw_string( myfixed->bin_window, font, gc, 
-                         x+2, 
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         6, 

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


@@ -117,10 +115,10 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
 
     if (!win->m_hasVMT) return;
     
 
     if (!win->m_hasVMT) return;
     

-    GtkMyFixed *myfixed = GTK_MYFIXED(widget);
+    GtkPizza *pizza = GTK_PIZZA(widget);

     
     gtk_draw_shadow( widget->style, 
     
     gtk_draw_shadow( widget->style, 

-                     myfixed->bin_window,
+                     pizza->bin_window,

                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,
                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,


@@ -131,21 +129,19 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {

-        GdkGC *gc = gdk_gc_new( myfixed->bin_window );
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );

         GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
         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_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );

-        gdk_draw_rectangle( myfixed->bin_window, gc, TRUE, 
-                            x, 
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

                             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 );
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );

-        gdk_draw_string( myfixed->bin_window, font, gc, 
-                         x+2, 
+        gdk_draw_string( pizza->bin_window, font, gc, 
+                         6, 

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


@@ -179,7 +175,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 +208,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 +269,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,


@@ -281,7 +304,6 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 {
     style = style | wxSIMPLE_BORDER;
     style = style | wxCAPTION;
 {
     style = style | wxSIMPLE_BORDER;
     style = style | wxCAPTION;

-    style = style | wxSYSTEM_MENU;

 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;
 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;


@@ -298,11 +320,21 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     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;
+        GdkWindow *parent = (GdkWindow*) &gdk_root_parent;
+        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( parent, &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_myfixed_put( GTK_MYFIXED(m_mainWidget), 
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget), 

                          close_button, 
                          close_button, 

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

     
         gtk_widget_show( close_button );
     
     
         gtk_widget_show( close_button );