X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f5392355df17ef8cd4884637a1ce71a07dd685..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/generic/progdlgg.cpp?ds=sidebyside diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 0e64813028..c261d63be4 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "progdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -115,7 +111,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, m_hasSkipButton = (style & wxPD_CAN_SKIP) != 0; bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); - + #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) // we have to remove the "Close" button from the title bar then as it is // confusing to have it - it doesn't work anyhow @@ -145,7 +141,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, wxClientDC dc(this); dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - long widthText; + long widthText = 0; dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL); wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); @@ -427,7 +423,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip) EnableCloseButton(); #endif // __WXMSW__ - if ( !newmsg.empty() ) + if ( newmsg.empty() ) { // also provide the finishing message if the application didn't m_msg->SetLabel(_("Done."));