Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

[wxWidgets.git] / include / wx / busyinfo.h

diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index 37e7238cb6005ab094c4e505151ce833f827fe52..b4a902dc15d12dc8eccd2ff470cd666191681fc9 100644 (file)
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -10,13 +10,13 @@
 #ifndef __INFOWIN_H__
 #define __INFOWIN_H__
 
 #ifndef __INFOWIN_H__
 #define __INFOWIN_H__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "busyinfo.h"

 #endif
 
 #include "wx/wxprec.h"
 
 #endif
 
 #include "wx/wxprec.h"
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -26,8 +26,8 @@
 
 class WXDLLEXPORT wxInfoFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxInfoFrame : public wxFrame
 {

-    public:
-        wxInfoFrame(wxWindow *parent, const wxString& message);
+public:
+    wxInfoFrame(wxWindow *parent, const wxString& message);

 };
 
 
 };
 
 


@@ -39,12 +39,15 @@ class WXDLLEXPORT wxInfoFrame : public wxFrame
 
 class WXDLLEXPORT wxBusyInfo : public wxObject
 {
 
 class WXDLLEXPORT wxBusyInfo : public wxObject
 {

-    public:
-        wxBusyInfo(const wxString& message);
-        ~wxBusyInfo();
+public:
+    wxBusyInfo(const wxString& message, wxWindow *parent = NULL);

 
 

-    private:
-        wxInfoFrame *m_InfoFrame;
+    virtual ~wxBusyInfo();
+
+private:
+    wxInfoFrame *m_InfoFrame;
+
+    DECLARE_NO_COPY_CLASS(wxBusyInfo)

 };
 
 
 };