#endif
#include "wx/minifram.h"
+
+#if wxUSE_MINIFRAME
+
#include "wx/dcscreen.h"
#include "gtk/gtk.h"
#include "wx/gtk/win_gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>
//-----------------------------------------------------------------------------
// idle system
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
-extern bool g_blockEventsOnScroll;
+extern bool g_blockEventsOnDrag;
+extern bool g_blockEventsOnScroll;
+extern GtkWidget *wxRootWindow;
//-----------------------------------------------------------------------------
// local functions
{
if (g_isIdle) wxapp_install_idle_handler();
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
if (gdk_event->count > 0) return;
+ GtkPizza *pizza = GTK_PIZZA(widget);
+
gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- 0, 0,
- win->m_width, win->m_height );
+ pizza->bin_window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ 0, 0,
+ win->m_width, win->m_height );
if (!win->m_title.IsEmpty() &&
- ((win->m_windowStyle & wxCAPTION) ||
- (win->m_windowStyle & wxTINY_CAPTION_HORIZ) ||
- (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+ ((win->GetWindowStyle() & wxCAPTION) ||
+ (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
+ (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
{
- GdkGC *gc = gdk_gc_new( widget->window );
- GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
- int x = 2;
- if (win->m_windowStyle & wxSYSTEM_MENU) x = 18;
-
+ 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( widget->window, gc, TRUE,
- x,
- 3,
- win->m_width - 4 - x,
- font->ascent + font->descent+1 );
-
- gdk_gc_set_foreground( gc, &widget->style->white );
- gdk_draw_string( widget->window, font, gc,
- x+2,
- 3+font->ascent,
- win->m_title.mb_str() );
-
+ 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 );
}
}
{
if (g_isIdle) wxapp_install_idle_handler();
- if (!win->HasVMT()) return;
+ if (!win->m_hasVMT) return;
+
+ GtkPizza *pizza = GTK_PIZZA(widget);
gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- 0, 0,
- win->m_width, win->m_height );
-
+ pizza->bin_window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ 0, 0,
+ win->m_width, win->m_height );
+
if (!win->m_title.IsEmpty() &&
- ((win->m_windowStyle & wxCAPTION) ||
- (win->m_windowStyle & wxTINY_CAPTION_HORIZ) ||
- (win->m_windowStyle & wxTINY_CAPTION_VERT)))
+ ((win->GetWindowStyle() & wxCAPTION) ||
+ (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
+ (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
{
- GdkGC *gc = gdk_gc_new( widget->window );
- GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0);
- int x = 2;
- if (win->m_windowStyle & wxSYSTEM_MENU) x = 17;
-
+ 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( widget->window, gc, TRUE,
- x,
- 3,
- win->m_width - 4 - x,
- font->ascent + font->descent+1 );
-
- gdk_gc_set_foreground( gc, &widget->style->white );
- gdk_draw_string( widget->window, font, gc,
- x+2,
- 3+font->ascent,
- win->m_title.mb_str() );
-
+ 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 );
}
}
{
if (g_isIdle) wxapp_install_idle_handler();
- if (!win->HasVMT()) return FALSE;
+ if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
if (win->m_isDragging) return TRUE;
+ gdk_window_raise( win->m_widget->window );
+
gdk_pointer_grab( widget->window, FALSE,
(GdkEventMask)
(GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK |
+ GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK |
- GDK_BUTTON_MOTION_MASK |
+ GDK_BUTTON_MOTION_MASK |
GDK_BUTTON1_MOTION_MASK),
(GdkWindow *) NULL,
(GdkCursor *) NULL,
- GDK_CURRENT_TIME );
-
+ (unsigned int) GDK_CURRENT_TIME );
+
win->m_diffX = (int)gdk_event->x;
win->m_diffY = (int)gdk_event->y;
DrawFrame( widget, 0, 0, win->m_width, win->m_height );
{
if (g_isIdle) wxapp_install_idle_handler();
- if (!win->HasVMT()) return FALSE;
+ if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
int y = (int)gdk_event->y;
DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height );
- gdk_pointer_ungrab ( GDK_CURRENT_TIME );
+ gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
int org_x = 0;
int org_y = 0;
gdk_window_get_origin( widget->window, &org_x, &org_y );
{
if (g_isIdle) wxapp_install_idle_handler();
- if (!win->HasVMT()) return FALSE;
+ if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return TRUE;
if (g_blockEventsOnScroll) return TRUE;
// wxMiniFrame
//-----------------------------------------------------------------------------
+static 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",
+/* pixels */
+" ### ",
+"# # #",
+"## ##",
+"# # #",
+" ### ",
+};
+
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
- style = style | wxSIMPLE_BORDER;
+ style = style | wxCAPTION | wxFRAME_FLOAT_ON_PARENT;
if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
m_miniTitle = 13;
-
+
m_miniEdge = 3;
m_isDragging = FALSE;
m_oldX = -1;
if ((style & wxSYSTEM_MENU) &&
((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
{
- GtkWidget *close_button = gtk_button_new_with_label( "x" );
+ GdkBitmap *mask = (GdkBitmap*) NULL;
+ GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm );
+
+ GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
+ gdk_bitmap_unref( mask );
+ gdk_pixmap_unref( pixmap );
+ gtk_widget_show( pw );
+
+ GtkWidget *close_button = gtk_button_new();
+ gtk_container_add( GTK_CONTAINER(close_button), pw );
- gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
- close_button,
- 4, 4, 12, 11 );
+ gtk_pizza_put( GTK_PIZZA(m_mainWidget),
+ close_button,
+ size.x-16, 4, 11, 11 );
gtk_widget_show( close_button );
return TRUE;
}
+
+#endif
projects / wxWidgets.git / blobdiff