Minor fixes, should be ok now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6776a0b25c
commit
051b55ad8b
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user