AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed static methods from wxAppTraitsBase, this doesn't work well in non-monolithic DLL build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-07-03 12:42:14 +00:00
parent ee2b827101
commit 7843d11bdc
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/apptrait.h
View File

@ -24,21 +24,9 @@ class WXDLLEXPORT wxMessageOutput;
// wxAppTraits: this class defines various configurable aspects of wxApp // wxAppTraits: this class defines various configurable aspects of wxApp
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_BASE
class WXDLLIMPEXP_BASE wxAppTraitsBase class WXDLLIMPEXP_BASE wxAppTraitsBase
#else
class WXDLLIMPEXP_CORE wxAppTraitsBase
#endif
{ {
public: public:
// wxAppTraits is an ABC, but we also provide 2 standard implementations of
// it, one for the console apps and the other for the GUI ones
static wxAppTraits *CreateConsole();
#if wxUSE_GUI
static wxAppTraits *CreateGUI();
#endif // wxUSE_GUI
// hooks for creating the global objects, may be overridden by the user // hooks for creating the global objects, may be overridden by the user
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

7
src/common/appbase.cpp
View File

@ -208,7 +208,7 @@ void wxAppConsole::Exit()
wxAppTraits *wxAppConsole::CreateTraits() wxAppTraits *wxAppConsole::CreateTraits()
{ {
return wxAppTraits::CreateConsole(); return new wxConsoleAppTraits;
} }
wxAppTraits *wxAppConsole::GetTraits() wxAppTraits *wxAppConsole::GetTraits()
@ -546,11 +546,6 @@ bool wxAppTraitsBase::ShowAssertDialog(const wxString& msg)
#endif // __WXDEBUG__ #endif // __WXDEBUG__
wxAppTraits *wxAppTraitsBase::CreateConsole()
{
return new wxConsoleAppTraits;
}
// ============================================================================ // ============================================================================
// global functions implementation // global functions implementation
// ============================================================================ // ============================================================================

11
src/common/appcmn.cpp
View File

@ -167,7 +167,7 @@ void wxAppBase::Exit()
wxAppTraits *wxAppBase::CreateTraits() wxAppTraits *wxAppBase::CreateTraits()
{ {
return wxAppTraits::CreateGUI(); return new wxGUIAppTraits;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -305,12 +305,3 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
wxPendingDelete.DeleteObject(object); wxPendingDelete.DeleteObject(object);
} }
// ----------------------------------------------------------------------------
// wxAppTraits
// ----------------------------------------------------------------------------
wxAppTraits *wxAppTraitsBase::CreateGUI()
{
return new wxGUIAppTraits;
}