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

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 8cd8cd47973ca1a95d3884ac5e5722cfc7240fb5..d8f4975166024840fac08402d3eec9bd3330f564 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // 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
     // ------------------------------------------------------------------------
 

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 96eb54acc1bfef64dcb7d3c56e6fb23bb0edd642..c2528ec5c9e227db222927d9abc362520c9c15ef 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -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
 // ============================================================================

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 6898c219b9292e326d5eedf2841529e215754b7e..845d4ebc44d2f27bb95b15b78e17272bfc46691e 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -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;
-}
-