Merge new item attributes if any are already existing

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 7bb287317799ff1160449aaaadf1943ee88cf860..44c63efd1a0f9d4cda31b99ac7da23ff6a343592 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/appcmn.cpp
+// Name:        src/common/appcmn.cpp

 // Purpose:     wxAppConsole and wxAppBase methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxAppConsole and wxAppBase methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "appbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,13 +26,12 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/window.h"

     #include "wx/bitmap.h"
     #include "wx/bitmap.h"

-    #include "wx/intl.h"
-    #include "wx/list.h"

     #include "wx/log.h"
     #include "wx/msgdlg.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"

-    #include "wx/bitmap.h"

     #include "wx/confbase.h"
     #include "wx/confbase.h"

+    #include "wx/utils.h"

 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"


@@ -44,11 +39,11 @@
 #include "wx/evtloop.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"
 #include "wx/evtloop.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"

-#include "wx/utils.h"
+#include "wx/vidmode.h"

 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)
 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)

-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT

 #endif
 
 #if wxUSE_FONTMAP
 #endif
 
 #if wxUSE_FONTMAP


@@ -59,29 +54,14 @@
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 
 #include "wx/build.h"
 WX_CHECK_BUILD_OPTIONS("wxCore")
 

+WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;

 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 // ----------------------------------------------------------------------------
 
 // this defines wxEventLoopPtr
 
 // ----------------------------------------------------------------------------
 // wxEventLoopPtr
 // ----------------------------------------------------------------------------
 
 // this defines wxEventLoopPtr

-wxDEFINE_SCOPED_PTR_TYPE(wxEventLoop);
-
-// but we need a smart pointer tied to wxAppBase::m_mainLoop, so we define
-// another helper class
-class wxTiedEventLoopPtr : public wxEventLoopPtr
-{
-public:
-    wxTiedEventLoopPtr(wxEventLoop **ppEvtLoop, wxEventLoop *pLoop)
-        : wxEventLoopPtr(*ppEvtLoop = pLoop), m_ppEvtLoop(ppEvtLoop)
-        {
-        }
-
-    ~wxTiedEventLoopPtr() { *m_ppEvtLoop = NULL; }
-
-private:
-    wxEventLoop **m_ppEvtLoop;
-};
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)

 
 // ============================================================================
 // wxAppBase implementation
 
 // ============================================================================
 // wxAppBase implementation


@@ -94,8 +74,8 @@ private:
 wxAppBase::wxAppBase()
 {
     m_topWindow = (wxWindow *)NULL;
 wxAppBase::wxAppBase()
 {
     m_topWindow = (wxWindow *)NULL;

-    m_useBestVisual = FALSE;
-    m_isActive = TRUE;
+    m_useBestVisual = false;
+    m_isActive = true;

 
     m_mainLoop = NULL;
 
 
     m_mainLoop = NULL;
 


@@ -105,18 +85,18 @@ wxAppBase::wxAppBase()
     // OTOH, if we set it to No initially we'll have to overwrite it with Yes
     // when we enter our OnRun() because we do want the default behaviour from
     // then on. But this would be a problem if the user code calls
     // OTOH, if we set it to No initially we'll have to overwrite it with Yes
     // when we enter our OnRun() because we do want the default behaviour from
     // then on. But this would be a problem if the user code calls

-    // SetExitOnFrameDelete(FALSE) from OnInit().
+    // SetExitOnFrameDelete(false) from OnInit().

     //
     // So we use the special "Later" value which is such that
     //
     // So we use the special "Later" value which is such that

-    // GetExitOnFrameDelete() returns FALSE for it but which we know we can
+    // GetExitOnFrameDelete() returns false for it but which we know we can

     // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
     // call) overwrite in OnRun()
     m_exitOnFrameDelete = Later;
 }
 
     // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
     // call) overwrite in OnRun()
     m_exitOnFrameDelete = Later;
 }
 

-bool wxAppBase::Initialize(int& argc, wxChar **argv)
+bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)

 {
 {

-    if ( !wxAppConsole::Initialize(argc, argv) )
+    if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )

         return false;
 
 #if wxUSE_THREADS
         return false;
 
 #if wxUSE_THREADS


@@ -124,7 +104,6 @@ bool wxAppBase::Initialize(int& argc, wxChar **argv)
 #endif
 
     wxInitializeStockLists();
 #endif
 
     wxInitializeStockLists();

-    wxInitializeStockObjects();

 
     wxBitmap::InitStandardHandlers();
 
 
     wxBitmap::InitStandardHandlers();
 


@@ -142,22 +121,32 @@ wxAppBase::~wxAppBase()
 
 void wxAppBase::CleanUp()
 {
 
 void wxAppBase::CleanUp()
 {

-    // one last chance for pending objects to be cleaned up
+    // clean up all the pending objects

     DeletePendingObjects();
 
     DeletePendingObjects();
 

+    // and any remaining TLWs (they remove themselves from wxTopLevelWindows
+    // when destroyed, so iterate until none are left)
+    while ( !wxTopLevelWindows.empty() )
+    {
+        // do not use Destroy() here as it only puts the TLW in pending list
+        // but we want to delete them now
+        delete wxTopLevelWindows.GetFirst()->GetData();
+    }
+
+    // undo everything we did in Initialize() above

     wxBitmap::CleanUpHandlers();
 
     wxBitmap::CleanUpHandlers();
 

-    wxDeleteStockObjects();
+    wxStockGDI::DeleteAll();

 
     wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
 
     wxDeleteStockLists();
 
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 

-#if wxUSE_THREADS

     delete wxPendingEvents;
     wxPendingEvents = NULL;
 
     delete wxPendingEvents;
     wxPendingEvents = NULL;
 

+#if wxUSE_THREADS

     delete wxPendingEventsLocker;
     wxPendingEventsLocker = NULL;
 
     delete wxPendingEventsLocker;
     wxPendingEventsLocker = NULL;
 


@@ -168,6 +157,41 @@ void wxAppBase::CleanUp()
 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS
 }
 

+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxWindow* wxAppBase::GetTopWindow() const
+{
+    wxWindow* window = m_topWindow;
+    if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+        window = wxTopLevelWindows.GetFirst()->GetData();
+    return window;
+}
+
+wxVideoMode wxAppBase::GetDisplayMode() const
+{
+    return wxVideoMode();
+}
+
+wxLayoutDirection wxAppBase::GetLayoutDirection() const
+{
+#if wxUSE_INTL
+    const wxLocale *const locale = wxGetLocale();
+    if ( locale )
+    {
+        const wxLanguageInfo *const
+            info = wxLocale::GetLanguageInfo(locale->GetLanguage());
+
+        if ( info )
+            return info->LayoutDirection;
+    }
+#endif // wxUSE_INTL
+
+    // we don't know
+    return wxLayout_Default;
+}
+

 #if wxUSE_CMDLINE_PARSER
 
 // ----------------------------------------------------------------------------
 #if wxUSE_CMDLINE_PARSER
 
 // ----------------------------------------------------------------------------


@@ -188,7 +212,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,

-            _T(""),
+            wxEmptyString,

             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,


@@ -202,7 +226,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,

-            _T(""),
+            wxEmptyString,

             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,


@@ -213,9 +237,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         // terminator
         {
             wxCMD_LINE_NONE,
         // terminator
         {
             wxCMD_LINE_NONE,

-            _T(""),
-            _T(""),
-            _T(""),
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,

             wxCMD_LINE_VAL_NONE,
             0x0
         }
             wxCMD_LINE_VAL_NONE,
             0x0
         }


@@ -234,7 +258,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( !theme )
         {
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
         if ( !theme )
         {
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());

-            return FALSE;
+            return false;

         }
 
         // Delete the defaultly created theme and set the new theme.
         }
 
         // Delete the defaultly created theme and set the new theme.


@@ -251,11 +275,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());

-            return FALSE;
+            return false;

         }
 
         }
 

-        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
-            return FALSE;
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+            return false;

     }
 #endif // __WXMGL__
 
     }
 #endif // __WXMGL__
 


@@ -270,7 +294,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
 
 int wxAppBase::MainLoop()
 {
 
 int wxAppBase::MainLoop()
 {

-    wxTiedEventLoopPtr mainLoop(&m_mainLoop, new wxEventLoop);
+    wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);

 
     return m_mainLoop->Run();
 }
 
     return m_mainLoop->Run();
 }


@@ -279,7 +303,7 @@ void wxAppBase::ExitMainLoop()
 {
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop
 {
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop

-    if ( m_mainLoop )
+    if ( m_mainLoop && m_mainLoop->IsRunning() )

     {
         m_mainLoop->Exit(0);
     }
     {
         m_mainLoop->Exit(0);
     }


@@ -300,7 +324,7 @@ bool wxAppBase::Dispatch()
     // see comment in Pending()
     wxEventLoop * const loop = wxEventLoop::GetActive();
 
     // see comment in Pending()
     wxEventLoop * const loop = wxEventLoop::GetActive();
 

-    return loop ? loop->Dispatch() : true;
+    return loop && loop->Dispatch();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -311,10 +335,10 @@ bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
 {
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )

-        return FALSE;
+        return false;

 #endif // __WXUNIVERSAL__
 
 #endif // __WXUNIVERSAL__
 

-    return TRUE;
+    return true;

 }
 
 int wxAppBase::OnRun()
 }
 
 int wxAppBase::OnRun()


@@ -366,6 +390,10 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
+

 void wxAppBase::DeletePendingObjects()
 {
     wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
 void wxAppBase::DeletePendingObjects()
 {
     wxList::compatibility_iterator node = wxPendingDelete.GetFirst();


@@ -373,45 +401,48 @@ void wxAppBase::DeletePendingObjects()
     {
         wxObject *obj = node->GetData();
 
     {
         wxObject *obj = node->GetData();
 

-        delete obj;
-
-        if (wxPendingDelete.Member(obj))
+        // remove it from the list first so that if we get back here somehow
+        // during the object deletion (e.g. wxYield called from its dtor) we
+        // wouldn't try to delete it the second time
+        if ( wxPendingDelete.Member(obj) )

             wxPendingDelete.Erase(node);
 
             wxPendingDelete.Erase(node);
 

+        delete obj;
+

         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.GetFirst();
     }
 }
 
         // Deleting one object may have deleted other pending
         // objects, so start from beginning of list again.
         node = wxPendingDelete.GetFirst();
     }
 }
 

-// Returns TRUE if more time is needed.
+// Returns true if more time is needed.

 bool wxAppBase::ProcessIdle()
 {
     wxIdleEvent event;
 bool wxAppBase::ProcessIdle()
 {
     wxIdleEvent event;

-    bool needMore = FALSE;
+    bool needMore = false;

     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))

-            needMore = TRUE;
+            needMore = true;

         node = node->GetNext();
     }
 
     event.SetEventObject(this);
     (void) ProcessEvent(event);
     if (event.MoreRequested())
         node = node->GetNext();
     }
 
     event.SetEventObject(this);
     (void) ProcessEvent(event);
     if (event.MoreRequested())

-        needMore = TRUE;
+        needMore = true;

 
     wxUpdateUIEvent::ResetUpdateTime();
 
     wxUpdateUIEvent::ResetUpdateTime();

-    
+

     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {
     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {

-    bool needMore = FALSE;
+    bool needMore = false;

 
     win->OnInternalIdle();
 
 
     win->OnInternalIdle();
 


@@ -421,14 +452,14 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
         win->GetEventHandler()->ProcessEvent(event);
 
         if (event.MoreRequested())
         win->GetEventHandler()->ProcessEvent(event);
 
         if (event.MoreRequested())

-            needMore = TRUE;
+            needMore = true;

     }
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {
         wxWindow *child = node->GetData();
         if (SendIdleEvents(child, event))
     }
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {
         wxWindow *child = node->GetData();
         if (SendIdleEvents(child, event))

-            needMore = TRUE;
+            needMore = true;

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -457,6 +488,24 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 }
 
 
 }
 

+// ----------------------------------------------------------------------------
+// exceptions support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXCEPTIONS
+
+bool wxAppBase::OnExceptionInMainLoop()
+{
+    throw;
+
+    // some compilers are too stupid to know that we never return after throw
+#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
+    return false;
+#endif
+}
+
+#endif // wxUSE_EXCEPTIONS
+

 // ----------------------------------------------------------------------------
 // wxGUIAppTraitsBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxGUIAppTraitsBase
 // ----------------------------------------------------------------------------


@@ -465,7 +514,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

+#if wxUSE_LOGGUI

     return new wxLogGui;
     return new wxLogGui;

+#else
+    // we must have something!
+    return new wxLogStderr;
+#endif

 }
 
 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG


@@ -521,7 +575,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 

-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),

                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:


@@ -565,45 +619,32 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
-    #include "wx/unix/gsockunx.h"
-#elif defined(__WINDOWS__)
+#if defined(__WINDOWS__)

     #include "wx/msw/gsockmsw.h"
     #include "wx/msw/gsockmsw.h"

+#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+    #include "wx/unix/gsockunx.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-  #include <MacHeaders.c>
-  #define OTUNIXERRORS 1
-  #include <OpenTransport.h>
-  #include <OpenTransportProviders.h>
-  #include <OpenTptInternet.h>
+    #include <MacHeaders.c>
+    #define OTUNIXERRORS 1
+    #include <OpenTransport.h>
+    #include <OpenTransportProviders.h>
+    #include <OpenTptInternet.h>

 
 

-  #include "wx/mac/gsockmac.h"
+    #include "wx/mac/gsockmac.h"

 #else
     #error "Must include correct GSocket header here"
 #endif
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {
 #else
     #error "Must include correct GSocket header here"
 #endif
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {

-#ifdef __WXMAC__
-    // NB: wxMac does not have any GUI-specific functions in gsocket.c and
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and

     //     so it doesn't need this table at all
     return NULL;
     //     so it doesn't need this table at all
     return NULL;

-#else // !__WXMAC__
-    static GSocketGUIFunctionsTable table =
-    {
-        _GSocket_GUI_Init,
-        _GSocket_GUI_Cleanup,
-        _GSocket_GUI_Init_Socket,
-        _GSocket_GUI_Destroy_Socket,
-#ifndef __WINDOWS__
-        _GSocket_Install_Callback,
-        _GSocket_Uninstall_Callback,
-#endif
-        _GSocket_Enable_Events,
-        _GSocket_Disable_Events
-    };
+#else // !__WXMAC__ || __DARWIN__
+    static GSocketGUIFunctionsTableConcrete table;

     return &table;
     return &table;

-#endif // __WXMAC__/!__WXMAC__
+#endif // !__WXMAC__ || __DARWIN__

 }
 
 #endif
 }
 
 #endif

-