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

fix wrong parenthesizing of boolean expressions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-07 07:15:07 +00:00
parent 2c685efab1
commit 02112408ba
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/frame.cpp
View File

@@ -221,7 +221,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
{ {
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
// menu bar // menu bar
if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
{ {
if (!m_menuBarDetached) if (!m_menuBarDetached)
(*height) -= m_menuBarHeight; (*height) -= m_menuBarHeight;
@@ -233,7 +233,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown() && if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
(*height) -= wxSTATUS_HEIGHT; (*height) -= wxSTATUS_HEIGHT;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
@@ -277,7 +277,7 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
// menu bar // menu bar
if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
{ {
if (!m_menuBarDetached) if (!m_menuBarDetached)
height += m_menuBarHeight; height += m_menuBarHeight;
@@ -289,7 +289,7 @@ void wxFrame::DoSetClientSize( int width, int height )
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// status bar // status bar
if (m_frameStatusBar && m_frameStatusBar->IsShown() && if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
height += wxSTATUS_HEIGHT; height += wxSTATUS_HEIGHT;
#endif #endif
@@ -359,7 +359,7 @@ void wxFrame::GtkOnSize()
// area, which is represented by m_wxwindow. // area, which is represented by m_wxwindow.
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR != 0))) if (m_frameMenuBar && !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOMENUBAR) != 0))
{ {
if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget)) if (!GTK_WIDGET_VISIBLE(m_frameMenuBar->m_widget))
gtk_widget_show( m_frameMenuBar->m_widget ); gtk_widget_show( m_frameMenuBar->m_widget );
@@ -481,7 +481,7 @@ void wxFrame::GtkOnSize()
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if (m_frameStatusBar && m_frameStatusBar->IsShown() && if (m_frameStatusBar && m_frameStatusBar->IsShown() &&
!(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR != 0))) !(m_fsIsShowing && (m_fsSaveFlag & wxFULLSCREEN_NOSTATUSBAR) != 0))
{ {
if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget)) if (!GTK_WIDGET_VISIBLE(m_frameStatusBar->m_widget))
gtk_widget_show( m_frameStatusBar->m_widget ); gtk_widget_show( m_frameStatusBar->m_widget );