Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 1efd57adddb6bd1cc567ed083c5a71241bc97e74..740deebb2b4b221369d1e0e38b48c13061ae7fd6 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -63,19 +63,6 @@
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 

-#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
-    // For MacTypes.h for Debugger function
-    #include <CoreFoundation/CFBase.h>
-#endif
-
-#if defined(__WXMAC__)
-    #ifdef __DARWIN__
-        #include  <CoreServices/CoreServices.h>
-    #else
-        #include  "wx/mac/private.h"  // includes mac headers
-    #endif
-#endif // __WXMAC__
-

 #ifdef __WXDEBUG__
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
 #ifdef __WXDEBUG__
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"


@@ -124,6 +111,8 @@ wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL;
 
 wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
 
 
 wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
 

+wxSocketManager *wxAppTraitsBase::ms_manager = NULL;
+

 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 // ----------------------------------------------------------------------------


@@ -144,7 +133,7 @@ wxAppConsoleBase::wxAppConsoleBase()
     m_traits = NULL;
     m_mainLoop = NULL;
 
     m_traits = NULL;
     m_mainLoop = NULL;
 

-    ms_appInstance = wx_static_cast(wxAppConsole *, this);
+    ms_appInstance = static_cast<wxAppConsole *>(this);

 
 #ifdef __WXDEBUG__
     SetTraceMasks();
 
 #ifdef __WXDEBUG__
     SetTraceMasks();


@@ -174,7 +163,7 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
 #endif // wxUSE_INTL
 
 #if wxUSE_THREADS
 #endif // wxUSE_INTL
 
 #if wxUSE_THREADS

-    wxPendingEventsLocker = new wxCriticalSection;
+    wxHandlersWithPendingEventsLocker = new wxCriticalSection;

 #endif
 
 #ifndef __WXPALMOS__
 #endif
 
 #ifndef __WXPALMOS__


@@ -201,12 +190,12 @@ void wxAppConsoleBase::CleanUp()
         m_mainLoop = NULL;
     }
 
         m_mainLoop = NULL;
     }
 

-    delete wxPendingEvents;
-    wxPendingEvents = NULL;
+    delete wxHandlersWithPendingEvents;
+    wxHandlersWithPendingEvents = NULL;

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-    delete wxPendingEventsLocker;
-    wxPendingEventsLocker = NULL;
+    delete wxHandlersWithPendingEventsLocker;
+    wxHandlersWithPendingEventsLocker = NULL;

 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS
 }
 


@@ -254,7 +243,7 @@ int wxAppConsoleBase::OnExit()
 #if wxUSE_CONFIG
     // delete the config object if any (don't use Get() here, but Set()
     // because Get() could create a new config object)
 #if wxUSE_CONFIG
     // delete the config object if any (don't use Get() here, but Set()
     // because Get() could create a new config object)

-    delete wxConfigBase::Set((wxConfigBase *) NULL);
+    delete wxConfigBase::Set(NULL);

 #endif // wxUSE_CONFIG
 
     return 0;
 #endif // wxUSE_CONFIG
 
     return 0;


@@ -290,6 +279,13 @@ wxAppTraits *wxAppConsoleBase::GetTraits()
     return m_traits;
 }
 
     return m_traits;
 }
 

+/* static */
+wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
+{
+    wxAppConsole * const app = GetInstance();
+    return app ? app->GetTraits() : NULL;
+}
+

 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event processing
 // ----------------------------------------------------------------------------


@@ -331,11 +327,11 @@ bool wxAppConsoleBase::Dispatch()
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {

-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
 

-    bool has = wxPendingEvents && !wxPendingEvents->IsEmpty();
+    bool has = wxHandlersWithPendingEvents && !wxHandlersWithPendingEvents->IsEmpty();

 
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+    wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
     return has;
 }
 
     return has;
 }


@@ -351,34 +347,34 @@ bool wxAppConsoleBase::IsMainLoopRunning()
 void wxAppConsoleBase::ProcessPendingEvents()
 {
 #if wxUSE_THREADS
 void wxAppConsoleBase::ProcessPendingEvents()
 {
 #if wxUSE_THREADS

-    if ( !wxPendingEventsLocker )
+    if ( !wxHandlersWithPendingEventsLocker )

         return;
 #endif
 
         return;
 #endif
 

-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
 

-    if (wxPendingEvents)
+    if (wxHandlersWithPendingEvents)

     {
         // iterate until the list becomes empty: the handlers remove themselves
         // from it when they don't have any more pending events
     {
         // iterate until the list becomes empty: the handlers remove themselves
         // from it when they don't have any more pending events

-        wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
+        wxList::compatibility_iterator node = wxHandlersWithPendingEvents->GetFirst();

         while (node)
         {
             // In ProcessPendingEvents(), new handlers might be add
             // and we can safely leave the critical section here.
         while (node)
         {
             // In ProcessPendingEvents(), new handlers might be add
             // and we can safely leave the critical section here.

-            wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+            wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
             wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
             handler->ProcessPendingEvents();
 
 
             wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
             handler->ProcessPendingEvents();
 

-            wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+            wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
             // restart as the iterators could have been invalidated
 
             // restart as the iterators could have been invalidated

-            node = wxPendingEvents->GetFirst();
+            node = wxHandlersWithPendingEvents->GetFirst();

         }
     }
 
         }
     }
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+    wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 }
 
 void wxAppConsoleBase::WakeUpIdle()
 }
 
 void wxAppConsoleBase::WakeUpIdle()


@@ -389,6 +385,9 @@ void wxAppConsoleBase::WakeUpIdle()
 
 bool wxAppConsoleBase::ProcessIdle()
 {
 
 bool wxAppConsoleBase::ProcessIdle()
 {

+    // process pending wx events before sending idle events
+    ProcessPendingEvents();
+

     wxIdleEvent event;
 
     event.SetEventObject(this);
     wxIdleEvent event;
 
     event.SetEventObject(this);


@@ -417,6 +416,20 @@ wxAppConsoleBase::HandleEvent(wxEvtHandler *handler,
     (handler->*func)(event);
 }
 
     (handler->*func)(event);
 }
 

+void wxAppConsoleBase::CallEventHandler(wxEvtHandler *handler,
+                                        wxEventFunctor& functor,
+                                        wxEvent& event) const
+{
+    // If the functor holds a method then, for backward compatibility, call
+    // HandleEvent():
+    wxEventFunction eventFunction = functor.GetMethod();
+
+    if ( eventFunction )
+        HandleEvent(handler, eventFunction, event);
+    else
+        functor(handler, event);
+}
+

 void wxAppConsoleBase::OnUnhandledException()
 {
 #ifdef __WXDEBUG__
 void wxAppConsoleBase::OnUnhandledException()
 {
 #ifdef __WXDEBUG__


@@ -673,12 +686,16 @@ void wxAppTraitsBase::MutexGuiLeave()
 
 void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {
 
 void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {

-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiEnter();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiEnter();

 }
 
 void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {
 }
 
 void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {

-    wxAppConsoleBase::GetInstance()->GetTraits()->MutexGuiLeave();
+    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
+    if ( traits )
+        traits->MutexGuiLeave();

 }
 #endif // wxUSE_THREADS
 
 }
 #endif // wxUSE_THREADS