From ce07cd8a753b3f7ef65ba0138bad86bb34cb4fff Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Wed, 22 Sep 2004 06:29:21 +0000 Subject: [PATCH] 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 --- include/wx/unix/displayx11.h | 2 +- src/generic/progdlgg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/unix/displayx11.h b/include/wx/unix/displayx11.h index 4258846df2..56d921ae84 100644 --- a/include/wx/unix/displayx11.h +++ b/include/wx/unix/displayx11.h @@ -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 diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index b8c4bc3169..f3747acd89 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -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; -- 2.45.2