fixed warning in non-DLL build

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index a797719db46546ef9d9d89a9398c238cb7af66f7..3cc03374bcc81d5e137d4ae883e8d3be67c2ca32 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -68,28 +68,28 @@ public:
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
 // pointer it holds in its dtor but also resets the global application pointer
 
 // we need a special kind of auto pointer to wxApp which not only deletes the
 // pointer it holds in its dtor but also resets the global application pointer

-wxDECLARE_SCOPED_PTR(wxApp, wxAppPtrBase);
-wxDEFINE_SCOPED_PTR(wxApp, wxAppPtrBase);
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase);

 
 class wxAppPtr : public wxAppPtrBase
 {
 public:
 
 class wxAppPtr : public wxAppPtrBase
 {
 public:

-    wxEXPLICIT wxAppPtr(wxApp *ptr = NULL) : wxAppPtrBase(ptr) { }
+    wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { }

     ~wxAppPtr()
     {
         if ( get() )
         {
             // the pointer is going to be deleted in the base class dtor, don't
             // leave the dangling pointer!
     ~wxAppPtr()
     {
         if ( get() )
         {
             // the pointer is going to be deleted in the base class dtor, don't
             // leave the dangling pointer!

-            wxTheApp = NULL;
+            wxApp::SetInstance(NULL);

         }
     }
 
         }
     }
 

-    void Set(wxApp *ptr)
+    void Set(wxAppConsole *ptr)

     {
         reset(ptr);
 
     {
         reset(ptr);
 

-        wxTheApp = ptr;
+        wxApp::SetInstance(ptr);

     }
 
     DECLARE_NO_COPY_CLASS(wxAppPtr)
     }
 
     DECLARE_NO_COPY_CLASS(wxAppPtr)


@@ -100,13 +100,13 @@ public:
 class wxCallAppCleanup
 {
 public:
 class wxCallAppCleanup
 {
 public:

-    wxCallAppCleanup(wxApp *app) : m_app(app) { }
+    wxCallAppCleanup(wxAppConsole *app) : m_app(app) { }

     ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
 
     void Dismiss() { m_app = NULL; }
 
 private:
     ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
 
     void Dismiss() { m_app = NULL; }
 
 private:

-    wxApp *m_app;
+    wxAppConsole *m_app;

 };
 
 // another tiny class which simply exists to ensure that wxEntryCleanup is
 };
 
 // another tiny class which simply exists to ensure that wxEntryCleanup is


@@ -356,7 +356,7 @@ void wxEntryCleanup()
         wxTheApp->CleanUp();
 
         delete wxTheApp;
         wxTheApp->CleanUp();
 
         delete wxTheApp;

-        wxTheApp = NULL;
+        wxApp::SetInstance(NULL);

     }
 
 
     }