ShowFullScreen() shows the window if it was still hidden (modified patch 1231514)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index f97d6ec69ea55816976bc2fc37917d0414f5919d..f7255eb89c00db9250c4e9bc2bcb2f170e3f62bb 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -29,6 +29,10 @@ wxWinCE:
 
 - RTTI and exceptions enabled by default.
 
 
 - RTTI and exceptions enabled by default.
 

+wxGTK:
+
+- ShowFullScreen() shows the window if it was still hidden (rpedroso)
+

 wxOS2
 
 - Adjustments for building with Open Watcom C++.
 wxOS2
 
 - Adjustments for building with Open Watcom C++.


@@ -38,6 +42,7 @@ wxUniv:
 - Window creation now honours wxVSCROLL.
 - Standalone scrollbars generate events of correct type (Jochen Roemmler)
 
 - Window creation now honours wxVSCROLL.
 - Standalone scrollbars generate events of correct type (Jochen Roemmler)
 

+

 2.6.1
 -----
 
 2.6.1
 -----
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 312f2ce56d1194fd6bc0a2ee88e5ee0c80b43a94..dc78d711d0f47c3c87eff44bc740354a7b1ba2b5 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -690,8 +690,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );

-
-        return true;

     }
     else
 #endif // GTK+ >= 2.2.0
     }
     else
 #endif // GTK+ >= 2.2.0


@@ -732,7 +730,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                                     (WXWindow)GDK_WINDOW_XWINDOW(window),
                                     show, &m_fsSaveFrame, method);
         }
                                     (WXWindow)GDK_WINDOW_XWINDOW(window),
                                     show, &m_fsSaveFrame, method);
         }

-        else
+        else // hide

         {
             if (method != wxX11_FS_WMSPEC)
             {
         {
             if (method != wxX11_FS_WMSPEC)
             {


@@ -753,6 +751,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
         }
     }
 
         }
     }
 

+    // documented behaviour is to show the window if it's still hidden when
+    // showing it full screen
+    if ( show && !IsShown() )
+        Show();
+

     return true;
 }
 
     return true;
 }
 

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 312f2ce56d1194fd6bc0a2ee88e5ee0c80b43a94..dc78d711d0f47c3c87eff44bc740354a7b1ba2b5 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -690,8 +690,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );

-
-        return true;

     }
     else
 #endif // GTK+ >= 2.2.0
     }
     else
 #endif // GTK+ >= 2.2.0


@@ -732,7 +730,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                                     (WXWindow)GDK_WINDOW_XWINDOW(window),
                                     show, &m_fsSaveFrame, method);
         }
                                     (WXWindow)GDK_WINDOW_XWINDOW(window),
                                     show, &m_fsSaveFrame, method);
         }

-        else
+        else // hide

         {
             if (method != wxX11_FS_WMSPEC)
             {
         {
             if (method != wxX11_FS_WMSPEC)
             {


@@ -753,6 +751,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
         }
     }
 
         }
     }
 

+    // documented behaviour is to show the window if it's still hidden when
+    // showing it full screen
+    if ( show && !IsShown() )
+        Show();
+

     return true;
 }
 
     return true;
 }