fixed broken logic in ShowFullScreen() (some compiler warnings are helpful)

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 045a1ec02247b9963511f7eb5d986dadd87d845c..aa4e7ee76ea8501e7deaab4a58fa63bdad88e7d7 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -622,7 +622,8 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 
 bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 {
-    if (show == m_fsIsShowing) return FALSE; // return what?
+    if (show == m_fsIsShowing)
+        return FALSE; // return what?
 
     m_fsIsShowing = show;
     
@@ -641,9 +642,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
+
+        return TRUE;
     }
     else
-#else
+#endif // GTK+ >= 2.2.0
     {
         GdkWindow *window = m_widget->window;
 
@@ -701,7 +704,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                     m_fsSaveFrame.width, m_fsSaveFrame.height);
         }
     }
-#endif
 
     return TRUE;
 }

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 045a1ec02247b9963511f7eb5d986dadd87d845c..aa4e7ee76ea8501e7deaab4a58fa63bdad88e7d7 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -622,7 +622,8 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 
 bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 {
-    if (show == m_fsIsShowing) return FALSE; // return what?
+    if (show == m_fsIsShowing)
+        return FALSE; // return what?
 
     m_fsIsShowing = show;
     
@@ -641,9 +642,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
             gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
         else
             gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
+
+        return TRUE;
     }
     else
-#else
+#endif // GTK+ >= 2.2.0
     {
         GdkWindow *window = m_widget->window;
 
@@ -701,7 +704,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                     m_fsSaveFrame.width, m_fsSaveFrame.height);
         }
     }
-#endif
 
     return TRUE;
 }