Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-07-28 22:03:40 +00:00
parent 97d8fe8791
commit 3b2931fbf5
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@@ -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 wxOS2
- Adjustments for building with Open Watcom C++. - Adjustments for building with Open Watcom C++.
@@ -38,6 +42,7 @@ wxUniv:
- Window creation now honours wxVSCROLL. - Window creation now honours wxVSCROLL.
- Standalone scrollbars generate events of correct type (Jochen Roemmler) - Standalone scrollbars generate events of correct type (Jochen Roemmler)
2.6.1 2.6.1
----- -----

9
src/gtk/toplevel.cpp
View File

@@ -690,8 +690,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gtk_window_fullscreen( GTK_WINDOW( m_widget ) ); gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
else else
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
return true;
} }
else else
#endif // GTK+ >= 2.2.0 #endif // GTK+ >= 2.2.0
@@ -732,7 +730,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
(WXWindow)GDK_WINDOW_XWINDOW(window), (WXWindow)GDK_WINDOW_XWINDOW(window),
show, &m_fsSaveFrame, method); 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;
} }

9
src/gtk1/toplevel.cpp
View File

@@ -690,8 +690,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gtk_window_fullscreen( GTK_WINDOW( m_widget ) ); gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
else else
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
return true;
} }
else else
#endif // GTK+ >= 2.2.0 #endif // GTK+ >= 2.2.0
@@ -732,7 +730,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
(WXWindow)GDK_WINDOW_XWINDOW(window), (WXWindow)GDK_WINDOW_XWINDOW(window),
show, &m_fsSaveFrame, method); 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;
} }