From b7ba00e77a3f69941d6a2050e67bdfff38b3238e Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 26 Jan 2006 15:40:46 +0000 Subject: [PATCH] wxBusyInfo interface moved to generic to make space for possible native implementations. wxInfoFrame moved from header to module. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 3 +++ build/bakefiles/files.bkl | 1 + build/msw/wx_core.dsp | 4 ++++ include/wx/busyinfo.h | 42 +++++----------------------------- include/wx/generic/busyinfo.h | 43 +++++++++++++++++++++++++++++++++++ src/generic/busyinfo.cpp | 26 +++++++++++++++------ 6 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 include/wx/generic/busyinfo.h diff --git a/Makefile.in b/Makefile.in index 726b0ba57b..957fbe0a33 100644 --- 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/mslu.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/mslu.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/generic/busyinfo.h \ wx/caret.h \ wx/choicebk.h \ wx/clipbrd.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index ae5dd696a7..ca42dc0202 100644 --- 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/generic/busyinfo.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 5cbcd93fe0..53c2e445c8 100644 --- 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 +SOURCE=..\..\include\wx\generic\busyinfo.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 b22c910f71..7840be70d7 100644 --- 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 @@ -7,45 +7,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __INFOWIN_H__ -#define __INFOWIN_H__ +#ifndef __BUSYINFO_H_BASE__ +#define __BUSYINFO_H_BASE__ #include "wx/defs.h" -#include "wx/frame.h" - #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 index 0000000000..143d7bd375 --- /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 42d406b79f..e11108364a 100644 --- 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 +// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,11 +15,24 @@ #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" +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"), @@ -111,6 +125,4 @@ wxBusyInfo::~wxBusyInfo() m_InfoFrame->Close(); } -#endif - // wxUSE_BUSYINFO - +#endif // wxUSE_BUSYINFO -- 2.45.2