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

diff --git a/include/wx/unix/displayx11.h b/include/wx/unix/displayx11.h
index 4258846df2627080a00ee2db5270c31315042f53..56d921ae847ff2e88924b435f3eab1beaeb5049b 100644 (file)
--- 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 b8c4bc316905b1fa0aecb4e055cfe8175d08043c..f3747acd89657681fd45b841a8dd22c21828c519 100644 (file)
--- 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;