X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/minifram.cpp diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 916328b6a5..9014e2cd50 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: minifram.cpp +// Name: src/gtk1/minifram.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,22 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "minifram.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/minifram.h" - #if wxUSE_MINIFRAME -#include "wx/dcscreen.h" +#include "wx/minifram.h" + +#ifndef WX_PRECOMP + #include "wx/dcscreen.h" +#endif #include "gtk/gtk.h" -#include "wx/gtk/win_gtk.h" -#include "wx/gtk/private.h" +#include "wx/dcclient.h" +#include "wx/gtk1/win_gtk.h" +#include "wx/gtk1/private.h" +#include "wx/gtk1/dcclient.h" #include #include @@ -69,6 +69,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(); @@ -85,15 +86,14 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g 0, 0, win->m_width, win->m_height ); - if (!win->GetTitle().IsEmpty() && + if (!win->GetTitle().empty() && ((win->GetWindowStyle() & wxCAPTION) || - (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || - (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) + (win->GetWindowStyle() & wxTINY_CAPTION))) { 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, @@ -104,17 +104,18 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g gdk_gc_unref( gc ); // Hack alert - dc.m_window = pizza->bin_window; + static_cast(dc.GetImpl())->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(); @@ -130,15 +131,14 @@ 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))) + (win->GetWindowStyle() & wxTINY_CAPTION))) { 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, @@ -149,17 +149,18 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU gdk_gc_unref( gc ); // Hack alert - dc.m_window = pizza->bin_window; + static_cast(dc.GetImpl())->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(); @@ -176,9 +177,9 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton 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, @@ -189,8 +190,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, + NULL, + NULL, (unsigned int) GDK_CURRENT_TIME ); win->m_diffX = (int)gdk_event->x; @@ -199,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(); @@ -218,7 +221,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto if (!win->m_isDragging) return TRUE; - win->m_isDragging = FALSE; + win->m_isDragging = false; int x = (int)gdk_event->x; int y = (int)gdk_event->y; @@ -236,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(); @@ -269,17 +274,20 @@ 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 @@ -320,11 +328,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title { style = style | wxCAPTION; - if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) + if ((style & wxCAPTION) || (style & wxTINY_CAPTION)) m_miniTitle = 13; m_miniEdge = 3; - m_isDragging = FALSE; + m_isDragging = false; m_oldX = -1; m_oldY = -1; m_diffX = 0; @@ -336,11 +344,11 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title { 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))) + ((style & wxCAPTION) || (style & wxTINY_CAPTION))) { - GdkBitmap *mask = (GdkBitmap*) NULL; + GdkBitmap *mask = NULL; GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d ( wxGetRootWindow()->window, @@ -371,10 +379,8 @@ 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", @@ -386,7 +392,14 @@ 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; } -#endif +void wxMiniFrame::SetTitle( const wxString &title ) +{ + wxFrame::SetTitle( title ); + + gtk_widget_draw( m_mainWidget, NULL ); +} + +#endif // wxUSE_MINIFRAME