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

use HasFlag(wxXX) instead of GetWindowStyle() & wxXX; it's more readable

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-27 10:15:28 +00:00
parent 790d7a2576
commit f62c55815f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/generic/progdlgg.cpp
View File

@@ -387,7 +387,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
// so that we return true below and that out [Cancel] handler knew what // so that we return true below and that out [Cancel] handler knew what
// to do // to do
m_state = Finished; m_state = Finished;
if( !(GetWindowStyle() & wxPD_AUTO_HIDE) ) if( !HasFlag(wxPD_AUTO_HIDE) )
{ {
EnableClose(); EnableClose();
DisableSkip(); DisableSkip();
@@ -401,7 +401,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
m_msg->SetLabel(_("Done.")); m_msg->SetLabel(_("Done."));
} }
wxYieldIfNeeded() ; wxYieldIfNeeded();
(void)ShowModal(); (void)ShowModal();
} }
@@ -575,7 +575,7 @@ wxProgressDialog::~wxProgressDialog()
void wxProgressDialog::ReenableOtherWindows() void wxProgressDialog::ReenableOtherWindows()
{ {
if ( GetWindowStyle() & wxPD_APP_MODAL ) if ( HasFlag(wxPD_APP_MODAL) )
{ {
delete m_winDisabler; delete m_winDisabler;
m_winDisabler = (wxWindowDisabler *)NULL; m_winDisabler = (wxWindowDisabler *)NULL;
@@ -599,10 +599,10 @@ static void SetTimeLabel(unsigned long val, wxStaticText *label)
if (val != (unsigned long)-1) if (val != (unsigned long)-1)
{ {
unsigned long hours = val / 3600; unsigned long hours = val / 3600;
unsigned long minutes = (val % 3600) / 60; unsigned long minutes = (val % 3600) / 60;
unsigned long seconds = val % 60; unsigned long seconds = val % 60;
s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds); s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds);
} }
else else
{ {