wxBusyInfo interface moved to generic to make space for possible native implementatio...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 726b0ba57b456776befc6ef1e2562ad9afe5d62a..957fbe0a3327fe795ec8456e3df2f66009dee89b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -467,6 +467,7 @@ ALL_PORTS_BASE_HEADERS =  \
        wx/msw/gccpriv.h \
        wx/msw/libraries.h \
        wx/msw/mimetype.h \
        wx/msw/gccpriv.h \
        wx/msw/libraries.h \
        wx/msw/mimetype.h \

+       wx/msw/mslu.h \

        wx/msw/private.h \
        wx/msw/stackwalk.h \
        wx/msw/stdpaths.h \
        wx/msw/private.h \
        wx/msw/stackwalk.h \
        wx/msw/stdpaths.h \


@@ -1542,6 +1543,7 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
        wx/msw/gccpriv.h \
        wx/msw/libraries.h \
        wx/msw/mimetype.h \
        wx/msw/gccpriv.h \
        wx/msw/libraries.h \
        wx/msw/mimetype.h \

+       wx/msw/mslu.h \

        wx/msw/private.h \
        wx/msw/stackwalk.h \
        wx/msw/stdpaths.h \
        wx/msw/private.h \
        wx/msw/stackwalk.h \
        wx/msw/stdpaths.h \


@@ -2678,6 +2680,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/bitmap.h \
        wx/bookctrl.h \
        wx/busyinfo.h \
        wx/bitmap.h \
        wx/bookctrl.h \
        wx/busyinfo.h \

+       wx/generic/busyinfo.h \

        wx/caret.h \
        wx/choicebk.h \
        wx/clipbrd.h \
        wx/caret.h \
        wx/choicebk.h \
        wx/clipbrd.h \

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ae5dd696a7acb771269b72d7df0f5524e1107bfb..ca42dc02029fec34a9808421fc9ae625b6d681e6 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -725,6 +725,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bitmap.h
     wx/bookctrl.h
     wx/busyinfo.h
     wx/bitmap.h
     wx/bookctrl.h
     wx/busyinfo.h

+    wx/generic/busyinfo.h

     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h
     wx/caret.h
     wx/choicebk.h
     wx/clipbrd.h

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 5cbcd93fe09f177e06943a6ea7edd593ca94d9c8..53c2e445c872366e8ead54c8399630901642ce24 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -8387,6 +8387,10 @@ SOURCE=..\..\include\wx\busyinfo.h
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+

 SOURCE=..\..\include\wx\button.h
 # End Source File
 # Begin Source File
 SOURCE=..\..\include\wx\button.h
 # End Source File
 # Begin Source File

diff --git a/include/wx/busyinfo.h b/include/wx/busyinfo.h
index b22c910f7108d1fbd549985fd0f62bccd9d22ddd..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,45 +7,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __INFOWIN_H__
-#define __INFOWIN_H__
+#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__

diff --git a/include/wx/generic/busyinfo.h b/include/wx/generic/busyinfo.h
new file mode 100644 (file)
index 0000000..143d7bd
--- /dev/null
+++ b/include/wx/generic/busyinfo.h
@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/busyinfo.h
+// Purpose:     Information window (when app is busy)
+// Author:      Vaclav Slavik
+// Copyright:   (c) 1999 Vaclav Slavik
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __BUSYINFO_H__
+#define __BUSYINFO_H__
+
+#include "wx/defs.h"
+
+#include "wx/frame.h"
+
+#if wxUSE_BUSYINFO
+
+class WXDLLIMPEXP_CORE wxFrame;
+
+//--------------------------------------------------------------------------------
+// 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:
+    wxFrame *m_InfoFrame;
+
+    DECLARE_NO_COPY_CLASS(wxBusyInfo)
+};
+
+
+#endif // wxUSE_BUSYINFO
+
+#endif // __BUSYINFO_H__

diff --git a/src/generic/busyinfo.cpp b/src/generic/busyinfo.cpp
index 42d406b79f782a8ece3781e40a2f2ffcacece9e4..e11108364a670c37ae0a90fa82b1365392f9bb14 100644 (file)
--- a/src/generic/busyinfo.cpp
+++ b/src/generic/busyinfo.cpp
@@ -1,8 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        busyinfo.cpp
+// Name:        src/generic/busyinfo.cpp

 // 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

+// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,11 +15,24 @@
 
 #if wxUSE_BUSYINFO
 
 
 #if wxUSE_BUSYINFO
 

-#include "wx/stattext.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/stattext.h"
+    #include "wx/panel.h"
+    #include "wx/utils.h"
+#endif
+

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

+class WXDLLEXPORT wxInfoFrame : public wxFrame
+{
+public:
+    wxInfoFrame(wxWindow *parent, const wxString& message);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxInfoFrame)
+};
+

 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),
 
 wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
            : wxFrame(parent, wxID_ANY, wxT("Busy"),


@@ -111,6 +125,4 @@ wxBusyInfo::~wxBusyInfo()
     m_InfoFrame->Close();
 }
 
     m_InfoFrame->Close();
 }
 

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