X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9a535f540517303f3837145e29140fa027f08b9..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/minifram.cpp diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index a2659bc997..8e823f312b 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -12,14 +12,17 @@ #endif #include "wx/minifram.h" + +#if wxUSE_MINIFRAME + #include "wx/dcscreen.h" #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" -#include "gdk/gdkx.h" +#include +#include +#include //----------------------------------------------------------------------------- // idle system @@ -32,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 *wxGetRootWindow(); //----------------------------------------------------------------------------- // local functions @@ -43,7 +47,7 @@ extern bool g_blockEventsOnScroll; static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) { - int org_x = 0; + int org_x = 0; int org_y = 0; gdk_window_get_origin( widget->window, &org_x, &org_y ); x += org_x; @@ -52,7 +56,7 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() ); gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS ); gdk_gc_set_function( gc, GDK_INVERT ); - + gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h ); gdk_gc_unref( gc ); } @@ -65,39 +69,39 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; if (gdk_event->count > 0) return; - - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - win->m_width, win->m_height ); + + GtkPizza *pizza = GTK_PIZZA(widget); + + gtk_draw_shadow( widget->style, + pizza->bin_window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); if (!win->m_title.IsEmpty() && - ((win->m_windowStyle & wxCAPTION) || - (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || - (win->m_windowStyle & wxTINY_CAPTION_VERT))) + ((win->GetWindowStyle() & wxCAPTION) || + (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || + (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( widget->window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); - int x = 2; - if (win->m_windowStyle & wxSYSTEM_MENU) x = 18; - + GdkGC *gc = gdk_gc_new( pizza->bin_window ); + GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, - x, - 3, - win->m_width - 4 - x, - font->ascent + font->descent+1 ); - - gdk_gc_set_foreground( gc, &widget->style->white ); - gdk_draw_string( widget->window, font, gc, - x+2, - 3+font->ascent, - win->m_title.mb_str() ); - + gdk_draw_rectangle( pizza->bin_window, gc, TRUE, + 3, + 3, + win->m_width - 7, + font->ascent + font->descent+1 ); + + gdk_gc_set_foreground( gc, &widget->style->fg[GTK_STATE_SELECTED] ); + gdk_draw_string( pizza->bin_window, font, gc, + 6, + 3+font->ascent, + win->m_title.mb_str() ); + gdk_gc_unref( gc ); } } @@ -110,38 +114,38 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; - - gtk_draw_shadow( widget->style, - widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - win->m_width, win->m_height ); - + if (!win->m_hasVMT) return; + + GtkPizza *pizza = GTK_PIZZA(widget); + + gtk_draw_shadow( widget->style, + pizza->bin_window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); + if (!win->m_title.IsEmpty() && - ((win->m_windowStyle & wxCAPTION) || - (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || - (win->m_windowStyle & wxTINY_CAPTION_VERT))) + ((win->GetWindowStyle() & wxCAPTION) || + (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || + (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( widget->window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); - int x = 2; - if (win->m_windowStyle & wxSYSTEM_MENU) x = 17; - + GdkGC *gc = gdk_gc_new( pizza->bin_window ); + GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, - x, - 3, - win->m_width - 4 - x, - font->ascent + font->descent+1 ); - - gdk_gc_set_foreground( gc, &widget->style->white ); - gdk_draw_string( widget->window, font, gc, - x+2, - 3+font->ascent, - win->m_title.mb_str() ); - + gdk_draw_rectangle( pizza->bin_window, gc, TRUE, + 3, + 3, + win->m_width - 7, + font->ascent + font->descent+1 ); + + gdk_gc_set_foreground( gc, &widget->style->fg[GTK_STATE_SELECTED] ); + gdk_draw_string( pizza->bin_window, font, gc, + 6, + 3+font->ascent, + win->m_title.mb_str() ); + gdk_gc_unref( gc ); } } @@ -154,30 +158,32 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; if (win->m_isDragging) return TRUE; + gdk_window_raise( win->m_widget->window ); + gdk_pointer_grab( widget->window, FALSE, (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_MOTION_MASK | + GDK_BUTTON_MOTION_MASK | 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; DrawFrame( widget, 0, 0, win->m_width, win->m_height ); win->m_oldX = 0; win->m_oldY = 0; - + win->m_isDragging = TRUE; return TRUE; @@ -191,20 +197,20 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; if (!win->m_isDragging) return TRUE; - + win->m_isDragging = FALSE; - + int x = (int)gdk_event->x; 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 ); - int org_x = 0; + 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 ); x += org_x - win->m_diffX; @@ -224,12 +230,12 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; if (!win->m_isDragging) return TRUE; - + if (gdk_event->is_hint) { int x = 0; @@ -245,7 +251,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion win->m_oldX = (int)gdk_event->x - win->m_diffX; win->m_oldY = (int)gdk_event->y - win->m_diffY; DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); - + return TRUE; } @@ -264,47 +270,84 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram // 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, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - style = style | wxSIMPLE_BORDER; + style = style | wxCAPTION | wxFRAME_FLOAT_ON_PARENT; if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) m_miniTitle = 13; - + m_miniEdge = 3; m_isDragging = FALSE; m_oldX = -1; m_oldY = -1; m_diffX = 0; m_diffY = 0; - + wxFrame::Create( parent, id, title, pos, size, style, name ); if ((style & wxSYSTEM_MENU) && ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) { - GtkWidget *close_button = gtk_button_new_with_label( "x" ); - - gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), close_button, 4, 4 ); - gtk_widget_set_usize( close_button, 12, 11 ); - + GdkBitmap *mask = (GdkBitmap*) NULL; + GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->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, + size.x-16, 4, 11, 11 ); + gtk_widget_show( close_button ); - + gtk_signal_connect( GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); } - + /* these are called when the borders are drawn */ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event", GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); - + /* these are required for dragging the mini frame around */ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event", GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this ); @@ -317,3 +360,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title return TRUE; } + +#endif