don't leave two conscutive separators after "moving" a standard menu item to the...

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

diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index 33e18822245bfab99f2cbc312d3fd4c5b7009a67..4b8cf5551050181ef7d4509a3403aa4fc372dcb2 100644 (file)
--- a/include/wx/busyinfo.h
+++ b/include/wx/busyinfo.h
@@ -3,37 +3,30 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __INFOWIN_H__
 #define __INFOWIN_H__
 
-#ifdef __GNUG__
-#pragma implementation
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "busyinfo.h"
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/defs.h"
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
+#include "wx/frame.h"
 
 #if wxUSE_BUSYINFO
 
-#include <wx/dialog.h>
-
-
-
-
-class wxInfoFrame : public wxFrame
+class WXDLLEXPORT wxInfoFrame : public wxFrame
 {
-    public:
-        wxInfoFrame(wxWindow *parent, const wxString& message);
+public:
+    wxInfoFrame(wxWindow *parent, const wxString& message);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxInfoFrame)
 };
 
 
@@ -43,14 +36,17 @@ class wxInfoFrame : public wxFrame
 //                  Can be used in exactly same way as wxBusyCursor
 //--------------------------------------------------------------------------------
 
-class wxBusyInfo : public wxObject
+class WXDLLEXPORT wxBusyInfo : public wxObject
 {
-    public:
-        wxBusyInfo(const wxString& message);
-        ~wxBusyInfo();
+public:
+    wxBusyInfo(const wxString& message, wxWindow *parent = NULL);
+
+    virtual ~wxBusyInfo();
+
+private:
+    wxInfoFrame *m_InfoFrame;
 
-    private:
-        wxInfoFrame *m_InfoFrame;
+    DECLARE_NO_COPY_CLASS(wxBusyInfo)
 };