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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-12 17:58:33 +00:00
parent 8da1f9a99e
commit 8a8997c3be
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/toplevel.cpp
View File

@@ -622,7 +622,8 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) 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; m_fsIsShowing = show;
@@ -641,9 +642,11 @@ 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
#else #endif // GTK+ >= 2.2.0
{ {
GdkWindow *window = m_widget->window; GdkWindow *window = m_widget->window;
@@ -701,7 +704,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
m_fsSaveFrame.width, m_fsSaveFrame.height); m_fsSaveFrame.width, m_fsSaveFrame.height);
} }
} }
#endif
return TRUE; return TRUE;
} }

8
src/gtk1/toplevel.cpp
View File

@@ -622,7 +622,8 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style ) 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; m_fsIsShowing = show;
@@ -641,9 +642,11 @@ 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
#else #endif // GTK+ >= 2.2.0
{ {
GdkWindow *window = m_widget->window; GdkWindow *window = m_widget->window;
@@ -701,7 +704,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
m_fsSaveFrame.width, m_fsSaveFrame.height); m_fsSaveFrame.width, m_fsSaveFrame.height);
} }
} }
#endif
return TRUE; return TRUE;
} }