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;