From 4d8209b9070ea7120078e83a648f3627e57bc15a Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 13 Nov 2012 17:38:29 +0000 Subject: [PATCH] re-enable drawing our own resize grip with GTK3, themes can (and do) disable the native grip git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/minifram.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 013d3af5c0..3f435eec9c 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -104,14 +104,12 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMin int style = win->GetWindowStyle(); -#ifndef __WXGTK3__ if (style & wxRESIZE_BORDER) { dc.SetBrush( *wxGREY_BRUSH ); dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 ); } -#endif if (win->m_miniTitle && !win->GetTitle().empty()) { @@ -156,7 +154,6 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w int y = (int)gdk_event->y; int x = (int)gdk_event->x; -#ifndef __WXGTK3__ if ((style & wxRESIZE_BORDER) && (x > win->m_width-14) && (y > win->m_height-14)) { @@ -177,7 +174,6 @@ gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, w return TRUE; } -#endif if (win->m_miniTitle && (style & wxCLOSE_BOX)) { @@ -303,7 +299,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, if (!win->m_isDragging) { -#ifndef __WXGTK3__ if (win->GetWindowStyle() & wxRESIZE_BORDER) { if ((x > win->m_width-14) && (y > win->m_height-14)) @@ -312,7 +307,6 @@ gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, gdk_window_set_cursor(gtk_widget_get_window(widget), NULL); win->GTKUpdateCursor(false); } -#endif return TRUE; } -- 2.45.2