/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.cpp
+// Name: src/gtk/minifram.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// 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"
#include "gtk/gtk.h"
#include "wx/gtk/win_gtk.h"
+#include "wx/gtk/private.h"
#include <gdk/gdk.h>
#include <gdk/gdkprivate.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();
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);
-
- 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() );
-
- gdk_gc_unref( gc );
- }
-}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_mainWidget
-//-----------------------------------------------------------------------------
-
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
-{
- if (g_isIdle) wxapp_install_idle_handler();
-
- 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 );
+ wxClientDC dc(win);
+ dc.SetFont( *wxSMALL_FONT );
+ int height = dc.GetCharHeight();
- if (!win->m_title.IsEmpty() &&
- ((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);
-
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 );
}
}
+}
//-----------------------------------------------------------------------------
// "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();
GtkPizza *pizza = GTK_PIZZA(widget);
if (gdk_event->window != pizza->bin_window) return TRUE;
-
- GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
- int height = font->ascent + font->descent+1;
+
+ 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,
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();
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();
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
m_miniTitle = 13;
m_miniEdge = 3;
- m_isDragging = FALSE;
+ m_isDragging = false;
m_oldX = -1;
m_oldY = -1;
m_diffX = 0;
{
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)))
{
gtk_widget_show( close_button );
- gtk_signal_connect( GTK_OBJECT(close_button), "clicked",
- GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
+ g_signal_connect (close_button, "clicked",
+ G_CALLBACK (gtk_button_clicked_callback),
+ 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 );
+ g_signal_connect (m_mainWidget, "expose_event",
+ G_CALLBACK (gtk_window_own_expose_callback), 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 );
-
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_release_event",
- GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
+ g_signal_connect (m_mainWidget, "button_press_event",
+ G_CALLBACK (gtk_window_button_press_callback), this);
+ g_signal_connect (m_mainWidget, "button_release_event",
+ G_CALLBACK (gtk_window_button_release_callback), this);
+ g_signal_connect (m_mainWidget, "motion_notify_event",
+ G_CALLBACK (gtk_window_motion_notify_callback), this);
+
+ return true;
+}
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
+void wxMiniFrame::SetTitle( const wxString &title )
+{
+ wxFrame::SetTitle( title );
- return TRUE;
+ gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
}
#endif
projects / wxWidgets.git / blobdiff