Applied patch [ 705663 ] Fix capture mouse bug in wxGrid

[wxWidgets.git] / src / gtk / toplevel.cpp

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index d77ae76a911b0b7a692dcff0a01f37bd3533f3c9..b5a88382bf486a51bd4e8480bdd4a959c469765c 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -456,10 +456,15 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)
         // All this is for Motif Window Manager "hints" and is supposed to be
         // recognized by other WMs as well.
         if ((style & wxCAPTION) != 0)

+        {

             m_gdkDecor |= GDK_DECOR_TITLE;
             m_gdkDecor |= GDK_DECOR_TITLE;

-        if ((style & wxSYSTEM_MENU) != 0)
+        }
+        if ((style & wxCLOSE_BOX) != 0)

         {
             m_gdkFunc |= GDK_FUNC_CLOSE;
         {
             m_gdkFunc |= GDK_FUNC_CLOSE;

+        }
+        if ((style & wxSYSTEM_MENU) != 0)
+        {

             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)
             m_gdkDecor |= GDK_DECOR_MENU;
         }
         if ((style & wxMINIMIZE_BOX) != 0)


@@ -524,7 +529,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;
         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;


@@ -548,7 +553,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     }
     else
     {
     }
     else
     {

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;
         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;