Committing in .
Changes to make compilations on OpenVMS work: displayx11.h : one semicolon removed, since it is not needed progdlgg.cpp : On some systems (like OpenVMS) unsigned types are realy unsigned. So a comparison unsigned_var < 0 is always false and causes unreacheable code, which is flagged by the compiler. In this case a change from unsigned long to long was more what was intended here. Modified Files: wxWidgets/include/wx/unix/displayx11.h wxWidgets/src/generic/progdlgg.cpp ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2ae23cc5ce
commit
ce07cd8a75
@ -43,7 +43,7 @@ class WXDLLEXPORT wxDisplay : public wxDisplayBase
|
||||
private:
|
||||
wxDisplayUnixPriv *m_priv;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxDisplay);
|
||||
DECLARE_NO_COPY_CLASS(wxDisplay)
|
||||
};
|
||||
|
||||
#endif // wxUSE_DISPLAY
|
||||
|
@ -335,7 +335,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
|
||||
}
|
||||
}
|
||||
|
||||
unsigned long display_remaining = m_display_estimated - elapsed;
|
||||
long display_remaining = m_display_estimated - elapsed;
|
||||
if ( display_remaining < 0 )
|
||||
{
|
||||
display_remaining = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user