A better fix for wxHash{Map,Set} with g++ 4.7.

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

diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index 4b8cf5551050181ef7d4509a3403aa4fc372dcb2..7840be70d765b1104adc8d8e9e5c26217e21345a 100644 (file)
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        busyinfo.h
+// Name:        wx/busyinfo.h

 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik


@@ -7,49 +7,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __INFOWIN_H__
-#define __INFOWIN_H__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "busyinfo.h"
-#endif
+#ifndef __BUSYINFO_H_BASE__
+#define __BUSYINFO_H_BASE__

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#include "wx/frame.h"
-

 #if wxUSE_BUSYINFO
 
 #if wxUSE_BUSYINFO
 

-class WXDLLEXPORT wxInfoFrame : public wxFrame
-{
-public:
-    wxInfoFrame(wxWindow *parent, const wxString& message);
-
-private:
-    DECLARE_NO_COPY_CLASS(wxInfoFrame)
-};
-
-
-//--------------------------------------------------------------------------------
-// wxBusyInfo
-//                  Displays progress information
-//                  Can be used in exactly same way as wxBusyCursor
-//--------------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBusyInfo : public wxObject
-{
-public:
-    wxBusyInfo(const wxString& message, wxWindow *parent = NULL);
-
-    virtual ~wxBusyInfo();
-
-private:
-    wxInfoFrame *m_InfoFrame;
-
-    DECLARE_NO_COPY_CLASS(wxBusyInfo)
-};
-
+#include "wx/generic/busyinfo.h"

 
 

-#endif
+#endif // wxUSE_BUSYINFO

 
 

-#endif
+#endif // __BUSYINFO_H_BASE__