X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94640e0414bbf7ebe161bef98f55a946b8fae310..54c5498d0f54fdc2005fcddec4cac5e6acdc0036:/src/generic/busyinfo.cpp diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp index f2aa47c061..f3f737f4b8 100644 --- a/src/generic/busyinfo.cpp +++ b/src/generic/busyinfo.cpp @@ -3,38 +3,39 @@ // 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 #if wxUSE_BUSYINFO -#include "wx/busyinfo.h" #include "wx/stattext.h" #include "wx/panel.h" #include "wx/utils.h" +#include "wx/busyinfo.h" 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 | wxFRAME_TOOL_WINDOW) + wxTHICK_FRAME #else - wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW) + wxSIMPLE_BORDER #endif + | 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); @@ -103,17 +104,15 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent) { m_InfoFrame = new wxInfoFrame( parent, message); - m_InfoFrame->Show(TRUE); - wxYield(); + m_InfoFrame->Show(true); m_InfoFrame->Refresh(); - wxYield(); + m_InfoFrame->Update(); } wxBusyInfo::~wxBusyInfo() { - m_InfoFrame->Show(FALSE); + m_InfoFrame->Show(false); m_InfoFrame->Close(); - wxYield(); } #endif