X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68b767bf8891951dad85a8ec74b71c38027934fd..7fbe5489ad278f89ba20788310fe0db9f0647898:/src/generic/busyinfo.cpp diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp index 5acc107333..9def84ca34 100644 --- a/src/generic/busyinfo.cpp +++ b/src/generic/busyinfo.cpp @@ -3,16 +3,16 @@ // Purpose: Information window when app is busy // Author: Vaclav Slavik // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "busyinfo.h" #endif #include "wx/wxprec.h" -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -25,7 +25,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) - : wxFrame(parent, -1, wxT("Busy"), + : wxFrame(parent, wxID_ANY, wxT("Busy"), wxDefaultPosition, wxDefaultSize, #if defined(__WXX11__) wxTHICK_FRAME @@ -35,7 +35,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) | wxFRAME_TOOL_WINDOW) { wxPanel *panel = new wxPanel( this ); - wxStaticText *text = new wxStaticText(panel, -1, message); + wxStaticText *text = new wxStaticText(panel, wxID_ANY, message); panel->SetCursor(*wxHOURGLASS_CURSOR); text->SetCursor(*wxHOURGLASS_CURSOR); @@ -104,15 +104,19 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent) { m_InfoFrame = new wxInfoFrame( parent, message); - m_InfoFrame->Show(TRUE); + m_InfoFrame->Show(true); +#ifdef __WXMAC__ + m_InfoFrame->Update() ; +#else wxYield(); m_InfoFrame->Refresh(); wxYield(); +#endif } wxBusyInfo::~wxBusyInfo() { - m_InfoFrame->Show(FALSE); + m_InfoFrame->Show(false); m_InfoFrame->Close(); wxYield(); }