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

honour wx{CLOSE,MINIMIZE,MAXIMIZE}_BOX even for borderless windows; also always allow moving the windows as we don't have a special style to enable/disable this (#10029)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-02 23:44:51 +00:00
parent 1766bf3453
commit bb25a741c2
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/gtk/toplevel.cpp
View File

@@ -296,7 +296,7 @@ gtk_frame_configure_callback( GtkWidget* widget,
// "realize" from m_widget // "realize" from m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// we cannot MWM hints and icons before the widget has been realized, // we cannot the WM hints and icons before the widget has been realized,
// so we do this directly after realization // so we do this directly after realization
extern "C" { extern "C" {
@@ -304,15 +304,13 @@ static void
gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
wxTopLevelWindowGTK *win ) wxTopLevelWindowGTK *win )
{ {
// All this is for Motif Window Manager "hints" and is supposed to be
// recognized by other WM as well. Not tested.
gdk_window_set_decorations(win->m_widget->window, gdk_window_set_decorations(win->m_widget->window,
(GdkWMDecoration)win->m_gdkDecor); (GdkWMDecoration)win->m_gdkDecor);
gdk_window_set_functions(win->m_widget->window, gdk_window_set_functions(win->m_widget->window,
(GdkWMFunction)win->m_gdkFunc); (GdkWMFunction)win->m_gdkFunc);
// GTK's shrinking/growing policy // GTK's shrinking/growing policy
if ((win->m_gdkFunc & GDK_FUNC_RESIZE) == 0) if ( !(win->m_gdkFunc & GDK_FUNC_RESIZE) )
gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE); gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
else else
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1); gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
@@ -436,7 +434,8 @@ void wxTopLevelWindowGTK::Init()
m_isIconized = false; m_isIconized = false;
m_fsIsShowing = false; m_fsIsShowing = false;
m_themeEnabled = true; m_themeEnabled = true;
m_gdkDecor = m_gdkFunc = 0; m_gdkDecor =
m_gdkFunc = 0;
m_grabbed = false; m_grabbed = false;
m_deferShow = true; m_deferShow = true;
@@ -593,42 +592,43 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
g_signal_connect(m_widget, "property_notify_event", g_signal_connect(m_widget, "property_notify_event",
G_CALLBACK(property_notify_event), this); G_CALLBACK(property_notify_event), this);
// decorations // translate wx decorations styles into Motif WM hints (they are recognized
if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER)) // by other WMs as well)
// always enable moving the window as we have no separate flag for enabling
// it
m_gdkFunc = GDK_FUNC_MOVE;
if ( style & wxCLOSE_BOX )
m_gdkFunc |= GDK_FUNC_CLOSE;
if ( style & wxMINIMIZE_BOX )
m_gdkFunc |= GDK_FUNC_MINIMIZE;
if ( style & wxMAXIMIZE_BOX )
m_gdkFunc |= GDK_FUNC_MAXIMIZE;
if ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
{ {
m_gdkDecor = 0; m_gdkDecor = 0;
m_gdkFunc = 0;
} }
else else // have border
{ {
m_gdkDecor = GDK_DECOR_BORDER; m_gdkDecor = GDK_DECOR_BORDER;
m_gdkFunc = GDK_FUNC_MOVE;
// All this is for Motif Window Manager "hints" and is supposed to be if ( style & wxCAPTION )
// recognized by other WMs as well.
if ((style & wxCAPTION) != 0)
{
m_gdkDecor |= GDK_DECOR_TITLE; m_gdkDecor |= GDK_DECOR_TITLE;
}
if ((style & wxCLOSE_BOX) != 0) if ( style & wxSYSTEM_MENU )
{
m_gdkFunc |= GDK_FUNC_CLOSE;
}
if ((style & wxSYSTEM_MENU) != 0)
{
m_gdkDecor |= GDK_DECOR_MENU; m_gdkDecor |= GDK_DECOR_MENU;
}
if ((style & wxMINIMIZE_BOX) != 0) if ( style & wxMINIMIZE_BOX )
{
m_gdkFunc |= GDK_FUNC_MINIMIZE;
m_gdkDecor |= GDK_DECOR_MINIMIZE; m_gdkDecor |= GDK_DECOR_MINIMIZE;
}
if ((style & wxMAXIMIZE_BOX) != 0) if ( style & wxMAXIMIZE_BOX )
{
m_gdkFunc |= GDK_FUNC_MAXIMIZE;
m_gdkDecor |= GDK_DECOR_MAXIMIZE; m_gdkDecor |= GDK_DECOR_MAXIMIZE;
}
if ((style & wxRESIZE_BORDER) != 0) if ( style & wxRESIZE_BORDER )
{ {
m_gdkFunc |= GDK_FUNC_RESIZE; m_gdkFunc |= GDK_FUNC_RESIZE;
m_gdkDecor |= GDK_DECOR_RESIZEH; m_gdkDecor |= GDK_DECOR_RESIZEH;