Ensure there is valid context for DrawRectangle

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

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 129cd47b39920e76c7a2a91e33a9599e5aa4c86c..7f48ba31f331e4748683bf4f9c8f07800de91f1f 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -87,7 +87,7 @@ wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog)
 // wxGenericProgressDialog creation
 // ----------------------------------------------------------------------------
 
 // wxGenericProgressDialog creation
 // ----------------------------------------------------------------------------
 

-void wxGenericProgressDialog::Init(wxWindow *parent, int style)
+void wxGenericProgressDialog::Init()

 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);


@@ -95,9 +95,8 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style)
     // Initialize all our members that we always use (even when we don't
     // create a valid window in this class).
 
     // Initialize all our members that we always use (even when we don't
     // create a valid window in this class).
 

-    m_pdStyle = style;
-
-    m_parentTop = wxGetTopLevelParent(parent);
+    m_pdStyle = 0;
+    m_parentTop = NULL;

 
     m_gauge = NULL;
     m_msg = NULL;
 
     m_gauge = NULL;
     m_msg = NULL;


@@ -129,10 +128,10 @@ void wxGenericProgressDialog::Init(wxWindow *parent, int style)
     m_tempEventLoop = NULL;
 }
 
     m_tempEventLoop = NULL;
 }
 

-wxGenericProgressDialog::wxGenericProgressDialog(wxWindow *parent, int style)
+wxGenericProgressDialog::wxGenericProgressDialog()

                        : wxDialog()
 {
                        : wxDialog()
 {

-    Init(parent, style);
+    Init();

 }
 
 wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
 }
 
 wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,


@@ -142,24 +141,32 @@ wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
                                                  int style)
                        : wxDialog()
 {
                                                  int style)
                        : wxDialog()
 {

-    Init(parent, style);
+    Init();

 
     Create( title, message, maximum, parent, style );
 }
 
 
     Create( title, message, maximum, parent, style );
 }
 

-void wxGenericProgressDialog::Create( const wxString& title,
+void wxGenericProgressDialog::SetTopParent(wxWindow* parent)
+{
+    m_parentTop = GetParentForModalDialog(parent, GetWindowStyle());
+}
+
+bool wxGenericProgressDialog::Create( const wxString& title,

                                       const wxString& message,
                                       int maximum,
                                       wxWindow *parent,
                                       int style )
 {
                                       const wxString& message,
                                       int maximum,
                                       wxWindow *parent,
                                       int style )
 {

-    // Notice that GetParentForModalDialog() needs the dialog window style, not
-    // our wxProgressDialog-specific style.
+    SetTopParent(parent);
+
+    m_parentTop = wxGetTopLevelParent(parent);
+    m_pdStyle = style;
+

     wxWindow* const
         realParent = GetParentForModalDialog(parent, GetWindowStyle());
     wxWindow* const
         realParent = GetParentForModalDialog(parent, GetWindowStyle());

-    wxDialog::Create(realParent, wxID_ANY, title);

 
 

-    SetTitle( title );
+    if (!wxDialog::Create(realParent, wxID_ANY, title))
+        return false;

 
     SetMaximum(maximum);
 
 
     SetMaximum(maximum);
 


@@ -309,6 +316,7 @@ void wxGenericProgressDialog::Create( const wxString& title,
     }
 
     Update();
     }
 
     Update();

+    return true;

 }
 
 void wxGenericProgressDialog::UpdateTimeEstimates(int value,
 }
 
 void wxGenericProgressDialog::UpdateTimeEstimates(int value,