From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 3 Jul 2003 12:42:14 +0000 (+0000)
Subject: removed static methods from wxAppTraitsBase, this doesn't work well in non-monolithic... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7843d11bdca4860661bdb9b571373706c9f02456

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


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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 8cd8cd4797..d8f4975166 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -24,21 +24,9 @@ class WXDLLEXPORT wxMessageOutput;
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
-#if wxUSE_BASE
 class WXDLLIMPEXP_BASE wxAppTraitsBase
-#else
-class WXDLLIMPEXP_CORE wxAppTraitsBase
-#endif
 {
 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
     // ------------------------------------------------------------------------
 
diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 96eb54acc1..c2528ec5c9 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -208,7 +208,7 @@ void wxAppConsole::Exit()
 
 wxAppTraits *wxAppConsole::CreateTraits()
 {
-    return wxAppTraits::CreateConsole();
+    return new wxConsoleAppTraits;
 }
 
 wxAppTraits *wxAppConsole::GetTraits()
@@ -546,11 +546,6 @@ bool wxAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
 #endif // __WXDEBUG__
 
-wxAppTraits *wxAppTraitsBase::CreateConsole()
-{
-    return new wxConsoleAppTraits;
-}
-
 // ============================================================================
 // global functions implementation
 // ============================================================================
diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 6898c219b9..845d4ebc44 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -167,7 +167,7 @@ void wxAppBase::Exit()
 
 wxAppTraits *wxAppBase::CreateTraits()
 {
-    return wxAppTraits::CreateGUI();
+    return new wxGUIAppTraits;
 }
 
 // ----------------------------------------------------------------------------
@@ -305,12 +305,3 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
     wxPendingDelete.DeleteObject(object);
 }
 
-// ----------------------------------------------------------------------------
-// wxAppTraits
-// ----------------------------------------------------------------------------
-
-wxAppTraits *wxAppTraitsBase::CreateGUI()
-{
-    return new wxGUIAppTraits;
-}
-