Fixed Vadims fix.

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

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index c443c1daa344b1564856b82204f5912e832b9518..be101dcf52f5dc86ffca7a01b1d6a4f03f6d052b 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -7,63 +7,49 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation
+#pragma implementation "busyinfo.h"

 #endif
 
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 

-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
+#if wxUSE_BUSYINFO

 
 #include "wx/busyinfo.h"
 
 #include "wx/busyinfo.h"

-
-
-
+#include "wx/stattext.h"
+#include "wx/panel.h"
+#include "wx/utils.h"

 
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)

-    : wxFrame(parent, -1, "", wxPoint(0, 0), wxSize(400, 80), wxTHICK_FRAME | wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW)
+    : wxFrame(parent, -1, wxT(""), wxPoint(0, 0), wxSize(400, 80), wxTHICK_FRAME | wxSIMPLE_BORDER | wxFRAME_TOOL_WINDOW)

 {
 {

-    wxPanel *p = new wxPanel(this);
-    wxStaticText *s = new wxStaticText(p, -1, message, wxPoint(20, 20), wxSize(360, 40), wxALIGN_CENTER);
+    wxPanel *p = new wxPanel( this );
+    wxStaticText *s = new wxStaticText( p, -1, message, wxPoint(20, 20), wxSize(360, 40), wxALIGN_CENTER );

     Centre(wxBOTH);
     Centre(wxBOTH);

-    p -> SetCursor(*wxHOURGLASS_CURSOR);
-    s -> SetCursor(*wxHOURGLASS_CURSOR);
+    p->SetCursor(*wxHOURGLASS_CURSOR);
+    s->SetCursor(*wxHOURGLASS_CURSOR);

 }
 
 }
 

-
-
-

 wxBusyInfo::wxBusyInfo(const wxString& message) : wxObject()
 {
 wxBusyInfo::wxBusyInfo(const wxString& message) : wxObject()
 {

-    m_InfoFrame = new wxInfoFrame(NULL, message);
-    m_InfoFrame -> Show(TRUE);
+    m_InfoFrame = new wxInfoFrame( (wxWindow*) NULL, message);
+    m_InfoFrame->Show(TRUE);

     wxYield();
     wxYield();

-    m_InfoFrame -> Refresh();
+    m_InfoFrame->Refresh();

     wxYield();
 }
 
     wxYield();
 }
 

-
-

 wxBusyInfo::~wxBusyInfo()
 {
 wxBusyInfo::~wxBusyInfo()
 {

-    m_InfoFrame -> Show(FALSE);
-    m_InfoFrame -> Close();
+    m_InfoFrame->Show(FALSE);
+    m_InfoFrame->Close();

     wxYield();
 }
 
     wxYield();
 }
 

-
-
-
-
-
-
-
-
-
+#endif
+  // wxUSE_BUSYINFO