projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced image
[wxWidgets.git]
/
src
/
gtk1
/
minifram.cpp
diff --git
a/src/gtk1/minifram.cpp
b/src/gtk1/minifram.cpp
index 2e98dd832e54b497823460f37eca4cbe5e3a68a2..139f1433c1bf0f984c59f2822f59d95834ddd9ae 100644
(file)
--- a/
src/gtk1/minifram.cpp
+++ b/
src/gtk1/minifram.cpp
@@
-7,10
+7,13
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
-#pragma implementation "minifram.h"
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+
#pragma implementation "minifram.h"
#endif
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/minifram.h"
#if wxUSE_MINIFRAME
#include "wx/minifram.h"
#if wxUSE_MINIFRAME
@@
-66,6
+69,7
@@
static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h )
// "expose_event" of m_mainWidget
//-----------------------------------------------------------------------------
// "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();
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
{
if (g_isIdle) wxapp_install_idle_handler();
@@
-82,35
+86,38
@@
static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
0, 0,
win->m_width, win->m_height );
0, 0,
win->m_width, win->m_height );
- if (!win->
m_title
.IsEmpty() &&
+ if (!win->
GetTitle()
.IsEmpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
{
((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 );
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,
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,
- wxGTK_CONV( win->m_title ) );
-
+ height+1 );
gdk_gc_unref( gc );
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
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "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();
static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win )
{
if (g_isIdle) wxapp_install_idle_handler();
@@
-131,30
+138,33
@@
static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
{
(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 );
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,
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,
- wxGTK_CONV( win->m_title ) );
-
+ height+1 );
gdk_gc_unref( gc );
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
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "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();
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
if (g_isIdle) wxapp_install_idle_handler();
@@
-167,9
+177,11
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
GtkPizza *pizza = GTK_PIZZA(widget);
if (gdk_event->window != pizza->bin_window) 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;
- GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
- int height = font->ascent + font->descent+1;
if (gdk_event->y > height) return TRUE;
gdk_window_raise( win->m_widget->window );
if (gdk_event->y > height) return TRUE;
gdk_window_raise( win->m_widget->window );
@@
-196,11
+208,13
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
return TRUE;
}
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "button_release_event" of m_mainWidget
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "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();
static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
{
if (g_isIdle) wxapp_install_idle_handler();
@@
-229,11
+243,13
@@
static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
return TRUE;
}
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "motion_notify_event" of m_mainWidget
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "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();
static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
{
if (g_isIdle) wxapp_install_idle_handler();
@@
-262,17
+278,20
@@
static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
return TRUE;
}
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "clicked" of X system button
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "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();
}
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
{
if (g_isIdle) wxapp_install_idle_handler();
mf->Close();
}
+}
//-----------------------------------------------------------------------------
// wxMiniFrame
//-----------------------------------------------------------------------------
// wxMiniFrame
@@
-364,8
+383,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 );
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 );
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",
/* these are required for dragging the mini frame around */
gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_press_event",
@@
-380,4
+401,15
@@
bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
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
#endif