Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxBusyInfo interface moved to generic to make space for possible native implementations. wxInfoFrame moved from header to module.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 15:40:46 +00:00
parent 1e25a373d0
commit b7ba00e77a
6 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@@ -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 \

1
build/bakefiles/files.bkl
View File

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

4
build/msw/wx_core.dsp
View File

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

42
include/wx/busyinfo.h
View File

@@ -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);
#include "wx/generic/busyinfo.h"
private:
DECLARE_NO_COPY_CLASS(wxInfoFrame)
};
#endif // wxUSE_BUSYINFO
//--------------------------------------------------------------------------------
// 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)
};
#endif
#endif
#endif // __BUSYINFO_H_BASE__

43
include/wx/generic/busyinfo.h Normal file
View File

@@ -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__

26
src/generic/busyinfo.cpp
View File

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