Changed two conflicting defines in defs.h

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 2572ce49978d0a43254281a1dbdd95b1498f8004..b307cdd8e3d9c5e0f6aefc9eeab8ae590dc018e8 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -8,7 +8,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma implementation "appbase.h"

     #pragma implementation "app.h"
 #endif
 
     #pragma implementation "app.h"
 #endif
 


@@ -48,10 +47,6 @@
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
 

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif

 extern wxResourceCache *wxTheResourceCache;
 extern bool g_isIdle;
 
 extern wxResourceCache *wxTheResourceCache;
 extern bool g_isIdle;
 


@@ -127,7 +122,7 @@ unsigned char g_palette[64*3] =
 // local functions
 //-----------------------------------------------------------------------------
 
 // local functions
 //-----------------------------------------------------------------------------
 

-extern void wxFlushResources(void);
+extern void wxFlushResources();

 
 //-----------------------------------------------------------------------------
 // global functions
 
 //-----------------------------------------------------------------------------
 // global functions


@@ -206,7 +201,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 void wxapp_install_idle_handler()
 {
 
 void wxapp_install_idle_handler()
 {

-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, T("attempt to install idle handler twice") );
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );

 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */
 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */


@@ -265,7 +260,8 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
 
     return TRUE;
 }
 
     return TRUE;
 }

-#endif
+
+#endif // wxUSE_THREADS

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -397,7 +393,7 @@ bool wxApp::OnInitGui()
                     index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                     index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
 #else
                     index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
                     index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
 #else

-                    wxFAIL_MSG( T("Unsupported graphics hardware") );
+                    wxFAIL_MSG( wxT("Unsupported graphics hardware") );

 #endif
                 }
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
 #endif
                 }
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;


@@ -427,11 +423,9 @@ void wxApp::OnIdle( wxIdleEvent &event )
 
     s_inOnIdle = TRUE;
 
 
     s_inOnIdle = TRUE;
 

-#if wxUSE_THREADS

     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();
     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();

-#endif

 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();


@@ -520,25 +514,6 @@ void wxApp::Dispatch()
     gtk_main_iteration();
 }
 
     gtk_main_iteration();
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-
-        node = wxPendingEvents->First();
-    }
-}
-#endif // wxUSE_THREADS
-

 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();
 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();


@@ -640,7 +615,7 @@ void wxApp::CleanUp()
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {

-        wxLogDebug(T("There were memory leaks.\n"));
+        wxLogDebug(wxT("There were memory leaks.\n"));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -653,9 +628,8 @@ void wxApp::CleanUp()
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog)
         delete oldLog;
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog)
         delete oldLog;

-}
-

 #endif // wxUSE_LOG
 #endif // wxUSE_LOG

+}

 
 //-----------------------------------------------------------------------------
 // wxEntry
 
 //-----------------------------------------------------------------------------
 // wxEntry


@@ -681,7 +655,7 @@ int wxEntry( int argc, char *argv[] )
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,

-                     T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
+                     wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 


@@ -690,7 +664,7 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
         wxTheApp = (wxApp*) test_app;
     }
 

-    wxCHECK_MSG( wxTheApp, -1, T("wxWindows error: no application object") );
+    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );

 
     wxTheApp->argc = argc;
 #if wxUSE_UNICODE
 
     wxTheApp->argc = argc;
 #if wxUSE_UNICODE


@@ -794,7 +768,7 @@ wxApp::GetStdIcon(int which) const
             return wxIcon(warning_xpm);
 
         default:
             return wxIcon(warning_xpm);
 
         default:

-            wxFAIL_MSG(T("requested non existent standard icon"));
+            wxFAIL_MSG(wxT("requested non existent standard icon"));

             // still fall through
 
         case wxICON_HAND:
             // still fall through
 
         case wxICON_HAND: