Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-enable drawing our own resize grip with GTK3, themes can (and do) disable the native grip

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-11-13 17:38:29 +00:00
parent ab49aec91a
commit 4d8209b907
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/minifram.cpp
View File

@@ -104,14 +104,12 @@ static gboolean expose_event(GtkWidget* widget, GdkEventExpose* gdk_event, wxMin
int style = win->GetWindowStyle(); int style = win->GetWindowStyle();
#ifndef __WXGTK3__
if (style & wxRESIZE_BORDER) if (style & wxRESIZE_BORDER)
{ {
dc.SetBrush( *wxGREY_BRUSH ); dc.SetBrush( *wxGREY_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 ); dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
} }
#endif
if (win->m_miniTitle && !win->GetTitle().empty()) 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 y = (int)gdk_event->y;
int x = (int)gdk_event->x; int x = (int)gdk_event->x;
#ifndef __WXGTK3__
if ((style & wxRESIZE_BORDER) && if ((style & wxRESIZE_BORDER) &&
(x > win->m_width-14) && (y > win->m_height-14)) (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; return TRUE;
} }
#endif
if (win->m_miniTitle && (style & wxCLOSE_BOX)) 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) if (!win->m_isDragging)
{ {
#ifndef __WXGTK3__
if (win->GetWindowStyle() & wxRESIZE_BORDER) if (win->GetWindowStyle() & wxRESIZE_BORDER)
{ {
if ((x > win->m_width-14) && (y > win->m_height-14)) 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); gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
win->GTKUpdateCursor(false); win->GTKUpdateCursor(false);
} }
#endif
return TRUE; return TRUE;
} }