Fix mismatches between format strings and arguments.

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 77ec484ac179480f17f336b7ed20af4b44bce1b6..3c962a0f2e57920a1519adb0880e5c50f9718888 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -139,11 +139,6 @@ wxProgressDialog::wxProgressDialog(const wxString& title,
 
     m_parentTop = wxGetTopLevelParent(parent);
 
-    wxClientDC dc(this);
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    wxCoord widthText = 0;
-    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
-
     // top-level sizerTop
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
 
@@ -640,8 +635,7 @@ void wxProgressDialog::ReenableOtherWindows()
 {
     if ( HasFlag(wxPD_APP_MODAL) )
     {
-        delete m_winDisabler;
-        m_winDisabler = NULL;
+        wxDELETE(m_winDisabler);
     }
     else
     {