Fix wxCocoa build by including the relevant headers for the __WXOSX__ case.

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

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index f010b2fa67c357882edeb9977d011ffcfa35263a..26c875b43a67b70749519392ba4f0cbcbfe4a8e1 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -39,7 +39,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)

-                     wxTHICK_FRAME
+                     wxRESIZE_BORDER

 #else
                      wxSIMPLE_BORDER
 #endif
 #else
                      wxSIMPLE_BORDER
 #endif


@@ -115,9 +115,23 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);

+    if ( parent && parent->HasFlag(wxSTAY_ON_TOP) )
+    {
+        // we must have this flag to be in front of our parent if it has it
+        m_InfoFrame->SetWindowStyleFlag(wxSTAY_ON_TOP);
+    }
+

     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();
     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();

+
+#ifdef __WXGTK20__
+    // FIXME: this is pretty bad, as any call to Yield(), but without it, the
+    //         static text is never shown and neither gdk_display_flush() nor
+    //         gdk_display_sync() nor gdk_window_process_updates() helps
+    wxMilliSleep(100);
+    wxYield();
+#endif

 }
 
 wxBusyInfo::~wxBusyInfo()
 }
 
 wxBusyInfo::~wxBusyInfo()