projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge in from trunk r64802 - r68625
[wxWidgets.git]
/
src
/
gtk1
/
minifram.cpp
diff --git
a/src/gtk1/minifram.cpp
b/src/gtk1/minifram.cpp
index 53d01860b9c86552f945c785208fad415add3e7c..9014e2cd50b71b6097243b53147f627c1ca947e7 100644
(file)
--- 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$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,18
+7,22
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "minifram.h"
-#endif
-
-#include "wx/minifram.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_MINIFRAME
#if wxUSE_MINIFRAME
-#include "wx/dcscreen.h"
+#include "wx/minifram.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/dcscreen.h"
+#endif
#include "gtk/gtk.h"
#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
+#include "wx/dcclient.h"
+#include "wx/gtk1/win_gtk.h"
+#include "wx/gtk1/private.h"
+#include "wx/gtk1/dcclient.h"
#include <gdk/gdk.h>
#include <gdk/gdkprivate.h>
#include <gdk/gdk.h>
#include <gdk/gdkprivate.h>
@@
-65,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();
@@
-81,35
+86,36
@@
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.IsE
mpty() &&
+ if (!win->
GetTitle().e
mpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
((win->GetWindowStyle() & wxCAPTION) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
+ (win->GetWindowStyle() & wxTINY_CAPTION)))
{
{
- 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,
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 );
gdk_gc_unref( gc );
+
+ // Hack alert
+ static_cast<wxClientDCImpl *>(dc.GetImpl())->m_window = pizza->bin_window;
+ dc.SetTextForeground( *wxWHITE );
+ dc.DrawText( win->GetTitle(), 6, 3 );
}
}
}
}
+}
//-----------------------------------------------------------------------------
// "draw" of m_mainWidget
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// "draw" of m_mainWidget
//-----------------------------------------------------------------------------
+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();
@@
-125,35
+131,36
@@
static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
0, 0,
win->m_width, win->m_height );
0, 0,
win->m_width, win->m_height );
- if (!win->
m_title.IsE
mpty() &&
+ if (!win->
GetTitle().e
mpty() &&
((win->GetWindowStyle() & wxCAPTION) ||
((win->GetWindowStyle() & wxCAPTION) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
- (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
+ (win->GetWindowStyle() & wxTINY_CAPTION)))
{
{
- 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,
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 );
gdk_gc_unref( gc );
+
+ // Hack alert
+ static_cast<wxClientDCImpl *>(dc.GetImpl())->m_window = pizza->bin_window;
+ dc.SetTextForeground( *wxWHITE );
+ dc.DrawText( win->GetTitle(), 6, 3 );
}
}
}
}
+}
//-----------------------------------------------------------------------------
// "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();
@@
-164,6
+171,15
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
if (win->m_isDragging) return TRUE;
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,
gdk_window_raise( win->m_widget->window );
gdk_pointer_grab( widget->window, FALSE,
@@
-174,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),
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;
(unsigned int) GDK_CURRENT_TIME );
win->m_diffX = (int)gdk_event->x;
@@
-184,15
+200,17
@@
static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
win->m_oldX = 0;
win->m_oldY = 0;
win->m_oldX = 0;
win->m_oldY = 0;
- win->m_isDragging =
TRUE
;
+ win->m_isDragging =
true
;
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();
@@
-203,7
+221,7
@@
static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
if (!win->m_isDragging) return TRUE;
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;
int x = (int)gdk_event->x;
int y = (int)gdk_event->y;
@@
-221,11
+239,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();
@@
-254,17
+274,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
@@
-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 )
{
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
))
+ if ((style & wxCAPTION) || (style & wxTINY_CAPTION))
m_miniTitle = 13;
m_miniEdge = 3;
m_miniTitle = 13;
m_miniEdge = 3;
- m_isDragging =
FALSE
;
+ m_isDragging =
false
;
m_oldX = -1;
m_oldY = -1;
m_diffX = 0;
m_oldX = -1;
m_oldY = -1;
m_diffX = 0;
@@
-317,10
+340,15
@@
bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
wxFrame::Create( parent, id, title, pos, size, style, name );
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) &&
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,
GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d
(
wxGetRootWindow()->window,
@@
-364,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 );
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