fixed build

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

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index f2aa47c06151ff0be041a0a7ae4f8671cbec7d01..ad0bd8af6b57c92b3efd799a30ed0b83eee61d3e 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -12,26 +12,27 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #if wxUSE_BUSYINFO
 
 #pragma hdrstop
 #endif
 
 #if wxUSE_BUSYINFO
 

-#include "wx/busyinfo.h"

 #include "wx/stattext.h"
 #include "wx/panel.h"
 #include "wx/utils.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"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)
 
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
            : wxFrame(parent, -1, wxT("Busy"),
                      wxDefaultPosition, wxDefaultSize,
 #if defined(__WXX11__)

-                     wxTHICK_FRAME | wxFRAME_TOOL_WINDOW)
+                     wxTHICK_FRAME

 #else
 #else

-                     wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW)
+                     wxSIMPLE_BORDER

 #endif
 #endif

+                     | wxFRAME_TOOL_WINDOW)

 {
     wxPanel *panel = new wxPanel( this );
     wxStaticText *text = new wxStaticText(panel, -1, message);
 {
     wxPanel *panel = new wxPanel( this );
     wxStaticText *text = new wxStaticText(panel, -1, message);


@@ -104,9 +105,13 @@ wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
     m_InfoFrame = new wxInfoFrame( parent, message);
     m_InfoFrame->Show(TRUE);
 {
     m_InfoFrame = new wxInfoFrame( parent, message);
     m_InfoFrame->Show(TRUE);

+#ifdef __WXMAC__
+       m_InfoFrame->Update() ;
+#else

     wxYield();
     m_InfoFrame->Refresh();
     wxYield();
     wxYield();
     m_InfoFrame->Refresh();
     wxYield();

+#endif

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