X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46b1d59d6f69ad80dcf5955375578a6504d100a..9ce97705fc6314a502378020bffd5be1cfbe20e8:/src/unix/appunix.cpp

diff --git a/src/unix/appunix.cpp b/src/unix/appunix.cpp
index a40991715a..db90d98ffe 100644
--- a/src/unix/appunix.cpp
+++ b/src/unix/appunix.cpp
@@ -15,12 +15,9 @@
 #include <signal.h>
 #include <unistd.h>
 
-bool wxAppConsoleUnix::Initialize(int& argc, wxChar** argv)
+bool wxAppConsole::Initialize(int& argc, wxChar** argv)
 {
-    if ( !wxAppConsole::Initialize(argc,argv) )
-        return false;
-
-    if ( !m_mainLoop->IsOk() )
+    if ( !wxAppConsoleBase::Initialize(argc,argv) )
         return false;
 
     sigemptyset(&m_signalsCaught);
@@ -28,9 +25,9 @@ bool wxAppConsoleUnix::Initialize(int& argc, wxChar** argv)
     return true;
 }
 
-void wxAppConsoleUnix::HandleSignal(int signal)
+void wxAppConsole::HandleSignal(int signal)
 {
-    wxAppConsoleUnix * const app = wxTheApp;
+    wxAppConsole * const app = wxTheApp;
     if ( !app )
         return;
 
@@ -38,7 +35,7 @@ void wxAppConsoleUnix::HandleSignal(int signal)
     app->WakeUpIdle();
 }
 
-void wxAppConsoleUnix::CheckSignal()
+void wxAppConsole::CheckSignal()
 {
     for ( SignalHandlerHash::iterator it = m_signalHandlerHash.begin();
           it != m_signalHandlerHash.end();
@@ -53,13 +50,13 @@ void wxAppConsoleUnix::CheckSignal()
     }
 }
 
-bool wxAppConsoleUnix::SetSignalHandler(int signal, SignalHandler handler)
+bool wxAppConsole::SetSignalHandler(int signal, SignalHandler handler)
 {
     const bool install = handler != SIG_DFL && handler != SIG_IGN;
 
     struct sigaction sa;
     memset(&sa, 0, sizeof(sa));
-    sa.sa_handler = &wxAppConsoleUnix::HandleSignal;
+    sa.sa_handler = &wxAppConsole::HandleSignal;
     sa.sa_flags = SA_RESTART;
     int res = sigaction(signal, &sa, 0);
     if ( res != 0 )
@@ -75,3 +72,4 @@ bool wxAppConsoleUnix::SetSignalHandler(int signal, SignalHandler handler)
 
     return true;
 }
+