From 051b55ad8ba1efe5f7c16c430131d4cd1b5fb90e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Thu, 6 May 1999 09:47:01 +0000 Subject: [PATCH] Minor fixes, should be ok now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/dialog.cpp | 5 ++++- src/gtk/frame.cpp | 7 ++----- src/gtk1/dialog.cpp | 5 ++++- src/gtk1/frame.cpp | 7 ++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 685411ea48..58b7ff2a51 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -133,7 +133,7 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win ) /* all this is for Motif Window Manager "hints" and is supposed to be recognized by other WM as well. not tested. */ - long decor = (long) GDK_DECOR_BORDER ; + long decor = (long) GDK_DECOR_BORDER; long func = (long) GDK_FUNC_MOVE ; if ((win->m_windowStyle & wxCAPTION) != 0) @@ -147,16 +147,19 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win ) { func |= GDK_FUNC_MINIMIZE; decor |= GDK_DECOR_MINIMIZE; + decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0) { decor |= GDK_DECOR_MAXIMIZE; func |= GDK_FUNC_MAXIMIZE; + decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxRESIZE_BORDER) != 0) { func |= GDK_FUNC_RESIZE; decor |= GDK_DECOR_RESIZEH; + decor |= GDK_DECOR_BORDER; } gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 044bce6f8c..5bc43e0bb8 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -191,8 +191,8 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) /* all this is for Motif Window Manager "hints" and is supposed to be recognized by other WM as well. not tested. */ - long decor = (long) 0; - long func = (long) GDK_FUNC_MOVE|GDK_FUNC_CLOSE; + long decor = (long) GDK_DECOR_BORDER; + long func = (long) GDK_FUNC_MOVE; if ((win->m_windowStyle & wxCAPTION) != 0) decor |= GDK_DECOR_TITLE; @@ -205,19 +205,16 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) { func |= GDK_FUNC_MINIMIZE; decor |= GDK_DECOR_MINIMIZE; - decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0) { func |= GDK_FUNC_MAXIMIZE; decor |= GDK_DECOR_MAXIMIZE; - decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxRESIZE_BORDER) != 0) { func |= GDK_FUNC_RESIZE; decor |= GDK_DECOR_RESIZEH; - decor |= GDK_DECOR_BORDER; } diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 685411ea48..58b7ff2a51 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -133,7 +133,7 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win ) /* all this is for Motif Window Manager "hints" and is supposed to be recognized by other WM as well. not tested. */ - long decor = (long) GDK_DECOR_BORDER ; + long decor = (long) GDK_DECOR_BORDER; long func = (long) GDK_FUNC_MOVE ; if ((win->m_windowStyle & wxCAPTION) != 0) @@ -147,16 +147,19 @@ gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win ) { func |= GDK_FUNC_MINIMIZE; decor |= GDK_DECOR_MINIMIZE; + decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0) { decor |= GDK_DECOR_MAXIMIZE; func |= GDK_FUNC_MAXIMIZE; + decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxRESIZE_BORDER) != 0) { func |= GDK_FUNC_RESIZE; decor |= GDK_DECOR_RESIZEH; + decor |= GDK_DECOR_BORDER; } gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor); gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func); diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 044bce6f8c..5bc43e0bb8 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -191,8 +191,8 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) /* all this is for Motif Window Manager "hints" and is supposed to be recognized by other WM as well. not tested. */ - long decor = (long) 0; - long func = (long) GDK_FUNC_MOVE|GDK_FUNC_CLOSE; + long decor = (long) GDK_DECOR_BORDER; + long func = (long) GDK_FUNC_MOVE; if ((win->m_windowStyle & wxCAPTION) != 0) decor |= GDK_DECOR_TITLE; @@ -205,19 +205,16 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win ) { func |= GDK_FUNC_MINIMIZE; decor |= GDK_DECOR_MINIMIZE; - decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0) { func |= GDK_FUNC_MAXIMIZE; decor |= GDK_DECOR_MAXIMIZE; - decor |= GDK_DECOR_BORDER; } if ((win->m_windowStyle & wxRESIZE_BORDER) != 0) { func |= GDK_FUNC_RESIZE; decor |= GDK_DECOR_RESIZEH; - decor |= GDK_DECOR_BORDER; } -- 2.47.2