X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..1c4cd9e047e27a54b3587071a0d76f9c599f6d18:/src/generic/busyinfo.cpp diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp index 9def84ca34..42d406b79f 100644 --- a/src/generic/busyinfo.cpp +++ b/src/generic/busyinfo.cpp @@ -6,10 +6,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "busyinfo.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -52,7 +48,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) int nParentWidth = parent->GetClientSize().x; int nColor; - SetBackgroundColour("WHITE"); + SetBackgroundColour(wxT("WHITE")); nColor = (LONG)GetBackgroundColour().GetPixel(); ::WinSetPresParam( GetHwnd() @@ -60,7 +56,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) ,sizeof(LONG) ,(PVOID)&nColor ); - panel->SetBackgroundColour("WHITE"); + panel->SetBackgroundColour(wxT("WHITE")); nColor = (LONG)panel->GetBackgroundColour().GetPixel(); ::WinSetPresParam( GetHwndOf(panel) @@ -81,7 +77,7 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message) ,nHeight ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE ); - text->SetBackgroundColour("WHITE"); + text->SetBackgroundColour(wxT("WHITE")); nColor = (LONG)text->GetBackgroundColour().GetPixel(); ::WinSetPresParam( GetHwndOf(text) @@ -105,20 +101,14 @@ wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent) { m_InfoFrame = new wxInfoFrame( parent, message); m_InfoFrame->Show(true); -#ifdef __WXMAC__ - m_InfoFrame->Update() ; -#else - wxYield(); m_InfoFrame->Refresh(); - wxYield(); -#endif + m_InfoFrame->Update(); } wxBusyInfo::~wxBusyInfo() { m_InfoFrame->Show(false); m_InfoFrame->Close(); - wxYield(); } #endif