/////////////////////////////////////////////////////////////////////////////
-// Name: minifram.cpp
+// Name: src/gtk/minifram.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
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 );
+ gtk_paint_shadow (widget->style,
+ pizza->bin_window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ NULL, NULL, NULL, // FIXME: No clipping?
+ 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)))
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,
- 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();
-
- 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->GetWindowStyle() & wxCAPTION) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
- {
- 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,
}
}
}
-#endif
//-----------------------------------------------------------------------------
// "button_press_event" of m_mainWidget
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;
}
y += org_y - win->m_diffY;
win->m_x = x;
win->m_y = y;
- gtk_widget_set_uposition( win->m_widget, x, y );
+ gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
return TRUE;
}
static const 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",
+"5 5 2 1",
+"# c Gray0",
+" c None",
/* pixels */
-" ### ",
-"# # #",
-"## ##",
-"# # #",
-" ### ",
+"# #",
+" # # ",
+" # ",
+" # # ",
+"# #",
};
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
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( pw );
GtkWidget *close_button = gtk_button_new();
+#ifdef __WXGTK24__
+ if (!gtk_check_version(2,4,0))
+ gtk_button_set_focus_on_click( GTK_BUTTON(close_button), FALSE );
+#endif
gtk_container_add( GTK_CONTAINER(close_button), pw );
gtk_pizza_put( GTK_PIZZA(m_mainWidget),
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 );
-
-#ifndef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw",
- GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
-#endif
+ 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 );
-
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
-
- return TRUE;
+ 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;
}
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
projects / wxWidgets.git / blobdiff