X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d788b830c9653eaabcda82ef226d0a099e31552..d6a658ff0cd928953efdaf1ea56ff04b9cf281c1:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index b84b537ef2..1e4d289f8a 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -96,8 +96,8 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) ); dc.SetBrush( brush ); dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( win->m_miniEdge-1, - win->m_miniEdge-1, + dc.DrawRectangle( win->m_miniEdge-1, + win->m_miniEdge-1, win->m_width - (2*(win->m_miniEdge-1)), 15 ); @@ -107,7 +107,7 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose if (style & wxCLOSE_BOX) dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true ); } - + return false; } } @@ -175,8 +175,8 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w 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 = x; @@ -281,6 +281,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) ); else gdk_window_set_cursor( widget->window, NULL ); + win->GTKUpdateCursor(false); } return TRUE; } @@ -354,6 +355,9 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title m_gdkFunc = 0; if (style & wxRESIZE_BORDER) m_gdkFunc = GDK_FUNC_RESIZE; + gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height); + m_decorSize.Set(0, 0); + m_deferShow = false; // don't allow sizing smaller than decorations GdkGeometry geom;