X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2fa61e833ffe9789ef3d3327157e17101a4a2ce..5875d39c9ba19f518e691792524f2fd03261c825:/src/gtk1/minifram.cpp?ds=inline diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 8e823f312b..3e4e04231f 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: minifram.cpp +// Name: src/gtk/minifram.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,9 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "minifram.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/minifram.h" @@ -19,6 +18,7 @@ #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +#include "wx/gtk/private.h" #include #include @@ -65,6 +65,7 @@ static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) // "expose_event" of m_mainWidget //----------------------------------------------------------------------------- +extern "C" { static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -81,35 +82,38 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g 0, 0, win->m_width, win->m_height ); - if (!win->m_title.IsEmpty() && + if (!win->GetTitle().empty() && ((win->GetWindowStyle() & wxCAPTION) || (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( pizza->bin_window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + wxClientDC dc(win); + dc.SetFont( *wxSMALL_FONT ); + int height = dc.GetCharHeight(); + GdkGC *gc = gdk_gc_new( pizza->bin_window ); gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); 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() ); - + height+1 ); gdk_gc_unref( gc ); + + // Hack alert + dc.m_window = pizza->bin_window; + dc.SetTextForeground( *wxWHITE ); + dc.DrawText( win->GetTitle(), 6, 3 ); } } +} //----------------------------------------------------------------------------- // "draw" of m_mainWidget //----------------------------------------------------------------------------- +#ifndef __WXGTK20__ +extern "C" { static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -125,35 +129,38 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU 0, 0, win->m_width, win->m_height ); - if (!win->m_title.IsEmpty() && + if (!win->GetTitle().empty() && ((win->GetWindowStyle() & wxCAPTION) || (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { - GdkGC *gc = gdk_gc_new( pizza->bin_window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + wxClientDC dc(win); + dc.SetFont( *wxSMALL_FONT ); + int height = dc.GetCharHeight(); + GdkGC *gc = gdk_gc_new( pizza->bin_window ); gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); 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() ); - + height+1 ); gdk_gc_unref( gc ); + + // Hack alert + dc.m_window = pizza->bin_window; + dc.SetTextForeground( *wxWHITE ); + dc.DrawText( win->GetTitle(), 6, 3 ); } } +} +#endif //----------------------------------------------------------------------------- // "button_press_event" of m_mainWidget //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -164,6 +171,15 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton if (win->m_isDragging) return TRUE; + GtkPizza *pizza = GTK_PIZZA(widget); + if (gdk_event->window != pizza->bin_window) return TRUE; + + wxClientDC dc(win); + dc.SetFont( *wxSMALL_FONT ); + int height = dc.GetCharHeight() + 1; + + if (gdk_event->y > height) return TRUE; + gdk_window_raise( win->m_widget->window ); gdk_pointer_grab( widget->window, FALSE, @@ -184,15 +200,17 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton win->m_oldX = 0; win->m_oldY = 0; - win->m_isDragging = TRUE; + win->m_isDragging = true; return TRUE; } +} //----------------------------------------------------------------------------- // "button_release_event" of m_mainWidget //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -221,11 +239,13 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto return TRUE; } +} //----------------------------------------------------------------------------- // "motion_notify_event" of m_mainWidget //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -254,23 +274,26 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion return TRUE; } +} //----------------------------------------------------------------------------- // "clicked" of X system button //----------------------------------------------------------------------------- +extern "C" { static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf ) { if (g_isIdle) wxapp_install_idle_handler(); mf->Close(); } +} //----------------------------------------------------------------------------- // wxMiniFrame //----------------------------------------------------------------------------- -static char *cross_xpm[] = { +static const char *cross_xpm[] = { /* columns rows colors chars-per-pixel */ "5 5 16 1", " c Gray0", @@ -303,13 +326,13 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - style = style | wxCAPTION | wxFRAME_FLOAT_ON_PARENT; + style = style | wxCAPTION; if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) m_miniTitle = 13; m_miniEdge = 3; - m_isDragging = FALSE; + m_isDragging = false; m_oldX = -1; m_oldY = -1; m_diffX = 0; @@ -317,11 +340,22 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title 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))) { GdkBitmap *mask = (GdkBitmap*) NULL; - GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxGetRootWindow()->window, &mask, NULL, cross_xpm ); + GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d + ( + wxGetRootWindow()->window, + &mask, + NULL, + (char **)cross_xpm + ); GtkWidget *pw = gtk_pixmap_new( pixmap, mask ); gdk_bitmap_unref( mask ); @@ -345,8 +379,10 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event", GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this ); +#ifndef __WXGTK20__ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); +#endif /* these are required for dragging the mini frame around */ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event", @@ -358,7 +394,18 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event", GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - return TRUE; + return true; +} + +void wxMiniFrame::SetTitle( const wxString &title ) +{ + wxFrame::SetTitle( title ); + +#ifdef __WXGTK20__ + gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true ); +#else + gtk_widget_draw( m_mainWidget, (GdkRectangle*) NULL ); +#endif } #endif