X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acfd422afac254f4356904275656c0c15685fa1e..956dbab1eb04b32a006303df25fd05116eb5ef11:/src/gtk1/minifram.cpp diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 9b0c1f0309..9da9393c89 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -12,6 +12,9 @@ #endif #include "wx/minifram.h" + +#if wxUSE_MINIFRAME + #include "wx/dcscreen.h" #include "gtk/gtk.h" @@ -65,15 +68,41 @@ 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 ); + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); + + if (!win->m_title.IsEmpty() && + ((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->GetWindowStyle() & wxSYSTEM_MENU) x = 18; + + 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_gc_unref( gc ); + } } //----------------------------------------------------------------------------- @@ -84,14 +113,40 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; gtk_draw_shadow( widget->style, widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - win->m_width, win->m_height ); + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); + + if (!win->m_title.IsEmpty() && + ((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->GetWindowStyle() & wxSYSTEM_MENU) x = 17; + + 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_gc_unref( gc ); + } } //----------------------------------------------------------------------------- @@ -102,24 +157,26 @@ 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 ); - + win->m_diffX = (int)gdk_event->x; win->m_diffY = (int)gdk_event->y; DrawFrame( widget, 0, 0, win->m_width, win->m_height ); @@ -139,7 +196,7 @@ 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; @@ -172,7 +229,7 @@ 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; @@ -219,9 +276,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title long style, const wxString &name ) { style = style | wxSIMPLE_BORDER; - + + if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) + m_miniTitle = 13; + m_miniEdge = 3; - m_miniTitle = 13; m_isDragging = FALSE; m_oldX = -1; m_oldY = -1; @@ -230,15 +289,20 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title wxFrame::Create( parent, id, title, pos, size, style, name ); - GtkWidget *close_button = gtk_button_new_with_label( "x" ); + 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 ); + gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), + close_button, + 4, 4, 12, 11 ); - gtk_widget_show( close_button ); + gtk_widget_show( close_button ); - gtk_signal_connect( GTK_OBJECT(close_button), "clicked", - GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); + 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", @@ -259,3 +323,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title return TRUE; } + +#endif