From 32a95f9f1a4a0ed0f569394e379f220666a8e47f Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 14 Apr 1999 14:55:56 +0000 Subject: [PATCH] mini frame rewrite (titlebar still missing) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/minifram.h | 9 +- include/wx/gtk1/minifram.h | 9 +- src/gtk/frame.cpp | 15 +- src/gtk/minifram.cpp | 272 ++++++++++++++++++++++++------------- src/gtk1/frame.cpp | 15 +- src/gtk1/minifram.cpp | 272 ++++++++++++++++++++++++------------- 6 files changed, 386 insertions(+), 206 deletions(-) diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index 3747e49ffc..1828439281 100644 --- a/include/wx/gtk/minifram.h +++ b/include/wx/gtk/minifram.h @@ -53,16 +53,11 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ, const wxString& name = wxFrameNameStr); - // implementation + // implementation + bool m_isDragging; int m_oldX,m_oldY; int m_diffX,m_diffY; - - void DrawFrame( int x, int y ); - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - - DECLARE_EVENT_TABLE() }; #endif diff --git a/include/wx/gtk1/minifram.h b/include/wx/gtk1/minifram.h index 3747e49ffc..1828439281 100644 --- a/include/wx/gtk1/minifram.h +++ b/include/wx/gtk1/minifram.h @@ -53,16 +53,11 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ, const wxString& name = wxFrameNameStr); - // implementation + // implementation + bool m_isDragging; int m_oldX,m_oldY; int m_diffX,m_diffY; - - void DrawFrame( int x, int y ); - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - - DECLARE_EVENT_TABLE() }; #endif diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 6c94bcb55f..6acd1dd04d 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -505,11 +505,20 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height client_area_y_offset += hh; } - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, 0, client_area_y_offset ); + int client_x = m_miniEdge; + int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; + gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y ); + + int client_w = m_width - 2*m_miniEdge; + int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + gtk_widget_set_usize( m_wxwindow, client_w, client_h ); + } + else + { + /* if there is no m_mainWidget between m_widget and m_wxwindow there + is no need to set the size or position of m_wxwindow. */ } - gtk_widget_set_usize( m_wxwindow, m_width, m_height-client_area_y_offset ); - if (m_frameStatusBar) { int xx = 0 + m_miniEdge; diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 2407a21cd4..ea6f98fe1a 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -17,8 +17,171 @@ #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +#include "gdk/gdk.h" +#include "gdk/gdkprivate.h" +#include "gdk/gdkx.h" + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; + //----------------------------------------------------------------------------- -// "clicked" +// local functions +//----------------------------------------------------------------------------- + +/* draw XOR rectangle when moving mine frame around */ + +static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) +{ + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( widget->window, &org_x, &org_y ); + x += org_x; + y += org_y; + + GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() ); + gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS ); + gdk_gc_set_function( gc, GDK_INVERT ); + + gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h ); + gdk_gc_unref( gc ); +} + +//----------------------------------------------------------------------------- +// "expose_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win ) +{ + if (!win->HasVMT()) return; + if (gdk_event->count > 0) return; + + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); +} + +//----------------------------------------------------------------------------- +// "draw" of m_mainWidget +//----------------------------------------------------------------------------- + +static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win ) +{ + if (!win->HasVMT()) return; + + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); +} + +//----------------------------------------------------------------------------- +// "button_press_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (win->m_isDragging) return TRUE; + + gdk_pointer_grab( widget->window, FALSE, + (GdkEventMask) + (GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_MOTION_MASK | + GDK_BUTTON1_MOTION_MASK), + (GdkWindow *) NULL, + (GdkCursor *) NULL, + 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 ); + win->m_oldX = 0; + win->m_oldY = 0; + + win->m_isDragging = TRUE; + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "button_release_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (!win->m_isDragging) return TRUE; + + win->m_isDragging = FALSE; + + int x = (int)gdk_event->x; + 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 ); + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( widget->window, &org_x, &org_y ); + x += org_x - win->m_diffX; + y += org_y - win->m_diffY; + win->m_x = x; + win->m_y = y; + gtk_widget_set_uposition( win->m_widget, x, y ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "motion_notify_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (!win->m_isDragging) return TRUE; + + if (gdk_event->is_hint) + { + int x = 0; + int y = 0; + GdkModifierType state; + gdk_window_get_pointer(gdk_event->window, &x, &y, &state); + gdk_event->x = x; + gdk_event->y = y; + gdk_event->state = state; + } + + DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); + win->m_oldX = (int)gdk_event->x - win->m_diffX; + win->m_oldY = (int)gdk_event->y - win->m_diffY; + DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "clicked" of X system button //----------------------------------------------------------------------------- static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf ) @@ -30,11 +193,6 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram // wxMiniFrame //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxMiniFrame,wxFrame) - EVT_PAINT(wxMiniFrame::OnPaint) - EVT_MOUSE_EVENTS(wxMiniFrame::OnMouse) -END_EVENT_TABLE() - IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame) bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, @@ -55,7 +213,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title GtkWidget *close_button = gtk_button_new_with_label( "x" ); - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), close_button, 4, 4 ); + gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), close_button, 4, 4 ); gtk_widget_set_usize( close_button, 12, 11 ); gtk_widget_show( close_button ); @@ -63,94 +221,22 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title gtk_signal_connect( GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - return TRUE; -} - -void wxMiniFrame::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - if (m_miniTitle == 0) return; - if (m_title.IsEmpty()) return; - - wxPaintDC dc(this); - - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle( 0, 0, m_width, m_height ); - - dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( 1, 1, m_width-2, 1 ); - dc.DrawLine( 1, 1, 1, m_height-2 ); - - dc.SetPen( *wxMEDIUM_GREY_PEN ); - dc.DrawLine( 1, m_height-1, m_width-2, m_height-1 ); - dc.DrawLine( m_width-1, 1, m_width-1, m_height-2 ); - - dc.SetBrush( *wxBLUE_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( m_miniEdge, m_miniEdge, m_width - 2*m_miniEdge, m_miniTitle ); - - dc.SetTextForeground( *wxWHITE ); - dc.SetFont( *wxSMALL_FONT ); - dc.DrawText( m_title, 14 + m_miniEdge, 1 + m_miniEdge ); -} - -void wxMiniFrame::DrawFrame( int x, int y ) -{ - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y ); - x += org_x; - y += org_y; + /* 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 ); - wxScreenDC dc; - dc.SetLogicalFunction( wxXOR ); - - dc.DrawRectangle( x, y, m_width, m_height ); -} + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", + GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)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 ); -void wxMiniFrame::OnMouse( wxMouseEvent &event ) -{ - int x = event.GetX(); - int y = event.GetY(); + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_release_event", + GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this ); - if (event.LeftDown()) - { - CaptureMouse(); - m_diffX = x; - m_diffY = y; - DrawFrame( 0, 0 ); - m_oldX = 0; - m_oldY = 0; - m_isDragging = TRUE; - return; - } + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event", + GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - if (event.Dragging() && m_isDragging) - { - DrawFrame( m_oldX, m_oldY ); - m_oldX = x - m_diffX; - m_oldY = y - m_diffY; - DrawFrame( m_oldX, m_oldY ); - return; - } - - if (event.LeftUp() && m_isDragging) - { - m_isDragging = FALSE; - DrawFrame( m_oldX, m_oldY ); - ReleaseMouse(); - - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y ); - x += org_x - m_diffX; - y += org_y - m_diffY; - m_x = x; - m_y = y; - gtk_widget_set_uposition( m_widget, x, y ); - - return; - } - - event.Skip(); + return TRUE; } - diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 6c94bcb55f..6acd1dd04d 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -505,11 +505,20 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height client_area_y_offset += hh; } - gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, 0, client_area_y_offset ); + int client_x = m_miniEdge; + int client_y = client_area_y_offset + m_miniEdge + m_miniTitle; + gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y ); + + int client_w = m_width - 2*m_miniEdge; + int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle; + gtk_widget_set_usize( m_wxwindow, client_w, client_h ); + } + else + { + /* if there is no m_mainWidget between m_widget and m_wxwindow there + is no need to set the size or position of m_wxwindow. */ } - gtk_widget_set_usize( m_wxwindow, m_width, m_height-client_area_y_offset ); - if (m_frameStatusBar) { int xx = 0 + m_miniEdge; diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 2407a21cd4..ea6f98fe1a 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -17,8 +17,171 @@ #include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" +#include "gdk/gdk.h" +#include "gdk/gdkprivate.h" +#include "gdk/gdkx.h" + +//----------------------------------------------------------------------------- +// data +//----------------------------------------------------------------------------- + +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; + //----------------------------------------------------------------------------- -// "clicked" +// local functions +//----------------------------------------------------------------------------- + +/* draw XOR rectangle when moving mine frame around */ + +static void DrawFrame( GtkWidget *widget, int x, int y, int w, int h ) +{ + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( widget->window, &org_x, &org_y ); + x += org_x; + y += org_y; + + GdkGC *gc = gdk_gc_new( GDK_ROOT_PARENT() ); + gdk_gc_set_subwindow( gc, GDK_INCLUDE_INFERIORS ); + gdk_gc_set_function( gc, GDK_INVERT ); + + gdk_draw_rectangle( GDK_ROOT_PARENT(), gc, FALSE, x, y, w, h ); + gdk_gc_unref( gc ); +} + +//----------------------------------------------------------------------------- +// "expose_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win ) +{ + if (!win->HasVMT()) return; + if (gdk_event->count > 0) return; + + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); +} + +//----------------------------------------------------------------------------- +// "draw" of m_mainWidget +//----------------------------------------------------------------------------- + +static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxFrame *win ) +{ + if (!win->HasVMT()) return; + + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); +} + +//----------------------------------------------------------------------------- +// "button_press_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (win->m_isDragging) return TRUE; + + gdk_pointer_grab( widget->window, FALSE, + (GdkEventMask) + (GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_MOTION_MASK | + GDK_BUTTON1_MOTION_MASK), + (GdkWindow *) NULL, + (GdkCursor *) NULL, + 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 ); + win->m_oldX = 0; + win->m_oldY = 0; + + win->m_isDragging = TRUE; + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "button_release_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (!win->m_isDragging) return TRUE; + + win->m_isDragging = FALSE; + + int x = (int)gdk_event->x; + 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 ); + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( widget->window, &org_x, &org_y ); + x += org_x - win->m_diffX; + y += org_y - win->m_diffY; + win->m_x = x; + win->m_y = y; + gtk_widget_set_uposition( win->m_widget, x, y ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "motion_notify_event" of m_mainWidget +//----------------------------------------------------------------------------- + +static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return TRUE; + if (g_blockEventsOnScroll) return TRUE; + + if (!win->m_isDragging) return TRUE; + + if (gdk_event->is_hint) + { + int x = 0; + int y = 0; + GdkModifierType state; + gdk_window_get_pointer(gdk_event->window, &x, &y, &state); + gdk_event->x = x; + gdk_event->y = y; + gdk_event->state = state; + } + + DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); + win->m_oldX = (int)gdk_event->x - win->m_diffX; + win->m_oldY = (int)gdk_event->y - win->m_diffY; + DrawFrame( widget, win->m_oldX, win->m_oldY, win->m_width, win->m_height ); + + return TRUE; +} + +//----------------------------------------------------------------------------- +// "clicked" of X system button //----------------------------------------------------------------------------- static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf ) @@ -30,11 +193,6 @@ static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFram // wxMiniFrame //----------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxMiniFrame,wxFrame) - EVT_PAINT(wxMiniFrame::OnPaint) - EVT_MOUSE_EVENTS(wxMiniFrame::OnMouse) -END_EVENT_TABLE() - IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame) bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title, @@ -55,7 +213,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title GtkWidget *close_button = gtk_button_new_with_label( "x" ); - gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), close_button, 4, 4 ); + gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), close_button, 4, 4 ); gtk_widget_set_usize( close_button, 12, 11 ); gtk_widget_show( close_button ); @@ -63,94 +221,22 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title gtk_signal_connect( GTK_OBJECT(close_button), "clicked", GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this ); - return TRUE; -} - -void wxMiniFrame::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - if (m_miniTitle == 0) return; - if (m_title.IsEmpty()) return; - - wxPaintDC dc(this); - - dc.SetBrush( *wxTRANSPARENT_BRUSH ); - dc.DrawRectangle( 0, 0, m_width, m_height ); - - dc.SetPen( *wxWHITE_PEN ); - dc.DrawLine( 1, 1, m_width-2, 1 ); - dc.DrawLine( 1, 1, 1, m_height-2 ); - - dc.SetPen( *wxMEDIUM_GREY_PEN ); - dc.DrawLine( 1, m_height-1, m_width-2, m_height-1 ); - dc.DrawLine( m_width-1, 1, m_width-1, m_height-2 ); - - dc.SetBrush( *wxBLUE_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( m_miniEdge, m_miniEdge, m_width - 2*m_miniEdge, m_miniTitle ); - - dc.SetTextForeground( *wxWHITE ); - dc.SetFont( *wxSMALL_FONT ); - dc.DrawText( m_title, 14 + m_miniEdge, 1 + m_miniEdge ); -} - -void wxMiniFrame::DrawFrame( int x, int y ) -{ - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y ); - x += org_x; - y += org_y; + /* 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 ); - wxScreenDC dc; - dc.SetLogicalFunction( wxXOR ); - - dc.DrawRectangle( x, y, m_width, m_height ); -} + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", + GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)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 ); -void wxMiniFrame::OnMouse( wxMouseEvent &event ) -{ - int x = event.GetX(); - int y = event.GetY(); + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "button_release_event", + GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this ); - if (event.LeftDown()) - { - CaptureMouse(); - m_diffX = x; - m_diffY = y; - DrawFrame( 0, 0 ); - m_oldX = 0; - m_oldY = 0; - m_isDragging = TRUE; - return; - } + gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event", + GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this ); - if (event.Dragging() && m_isDragging) - { - DrawFrame( m_oldX, m_oldY ); - m_oldX = x - m_diffX; - m_oldY = y - m_diffY; - DrawFrame( m_oldX, m_oldY ); - return; - } - - if (event.LeftUp() && m_isDragging) - { - m_isDragging = FALSE; - DrawFrame( m_oldX, m_oldY ); - ReleaseMouse(); - - int org_x = 0; - int org_y = 0; - gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y ); - x += org_x - m_diffX; - y += org_y - m_diffY; - m_x = x; - m_y = y; - gtk_widget_set_uposition( m_widget, x, y ); - - return; - } - - event.Skip(); + return TRUE; } - -- 2.45.2