Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index ad464891f6c2027bb39286950cd772e3ac2cdc43..6eb1fc78d4c578f7aa0e2a850f838c4549b5b3f8 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/appcmn.cpp
-// Purpose:     wxAppConsole and wxAppBase methods common to all platforms
+// Name:        src/common/appcmn.cpp
+// Purpose:     wxAppBase methods common to all platforms

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     18.10.99


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

-#ifdef __GNUG__
-    #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,28 +26,30 @@
 
 #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"
+    #include "wx/wxcrtvararg.h"

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

+#include "wx/cmdline.h"

 #include "wx/msgout.h"
 #include "wx/thread.h"
 #include "wx/msgout.h"
 #include "wx/thread.h"

-#include "wx/utils.h"
-
-#if defined(__WXMSW__)
-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-#endif
+#include "wx/vidmode.h"
+#include "wx/evtloop.h"

 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
+

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


@@ -62,9 +60,12 @@
 
 wxAppBase::wxAppBase()
 {
 
 wxAppBase::wxAppBase()
 {

-    m_topWindow = (wxWindow *)NULL;
-    m_useBestVisual = FALSE;
-    m_isActive = TRUE;
+    m_topWindow = NULL;
+
+    m_useBestVisual = false;
+    m_forceTrueColour = false;
+
+    m_isActive = true;

 
     // We don't want to exit the app if the user code shows a dialog from its
     // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
 
     // We don't want to exit the app if the user code shows a dialog from its
     // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete


@@ -72,29 +73,28 @@ 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;
 
         return false;
 

-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
-

     wxInitializeStockLists();
     wxInitializeStockLists();

-    wxInitializeStockObjects();

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

+    // for compatibility call the old initialization function too
+    if ( !OnInitGui() )
+        return false;
+

     return true;
 }
 
     return true;
 }
 


@@ -109,32 +109,154 @@ 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();
 
 
     wxDeleteStockLists();
 

-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
+    wxDELETE(wxTheColourDatabase);

 
 

-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    wxPendingEvents = NULL;
+    wxAppConsole::CleanUp();
+}
+
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxWindow* wxAppBase::GetTopWindow() const
+{
+    wxWindow* window = m_topWindow;
+    if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+        window = wxTopLevelWindows.GetFirst()->GetData();
+    return window;
+}

 
 

-    delete wxPendingEventsLocker;
-    wxPendingEventsLocker = NULL;
+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

 
 

-#if wxUSE_VALIDATORS
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif // wxUSE_VALIDATORS
-#endif // wxUSE_THREADS
+    // we don't know
+    return wxLayout_Default;

 }
 
 }
 

+#if wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// GUI-specific command line options handling
+// ----------------------------------------------------------------------------
+
+#define OPTION_THEME   "theme"
+#define OPTION_MODE    "mode"
+
+void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
+{
+    // first add the standard non GUI options
+    wxAppConsole::OnInitCmdLine(parser);
+
+    // the standard command line options
+    static const wxCmdLineEntryDesc cmdLineGUIDesc[] =
+    {
+#ifdef __WXUNIVERSAL__
+        {
+            wxCMD_LINE_OPTION,
+            NULL,
+            OPTION_THEME,
+            gettext_noop("specify the theme to use"),
+            wxCMD_LINE_VAL_STRING,
+            0x0
+        },
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+        // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+        //     should provide this option. That's why it is in common/appcmn.cpp
+        //     and not mgl/app.cpp
+        {
+            wxCMD_LINE_OPTION,
+            NULL,
+            OPTION_MODE,
+            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
+            wxCMD_LINE_VAL_STRING,
+            0x0
+        },
+#endif // __WXMGL__
+
+        // terminator
+        wxCMD_LINE_DESC_END
+    };
+
+    parser.SetDesc(cmdLineGUIDesc);
+}
+
+bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+#ifdef __WXUNIVERSAL__
+    wxString themeName;
+    if ( parser.Found(OPTION_THEME, &themeName) )
+    {
+        wxTheme *theme = wxTheme::Create(themeName);
+        if ( !theme )
+        {
+            wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
+            return false;
+        }
+
+        // Delete the defaultly created theme and set the new theme.
+        delete wxTheme::Get();
+        wxTheme::Set(theme);
+    }
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+    wxString modeDesc;
+    if ( parser.Found(OPTION_MODE, &modeDesc) )
+    {
+        unsigned w, h, bpp;
+        if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )
+        {
+            wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
+            return false;
+        }
+
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+            return false;
+    }
+#endif // __WXMGL__
+
+    return wxAppConsole::OnCmdLineParsed(parser);
+}
+
+#endif // wxUSE_CMDLINE_PARSER
+

 // ----------------------------------------------------------------------------
 // OnXXX() hooks
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // OnXXX() hooks
 // ----------------------------------------------------------------------------


@@ -143,10 +265,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()


@@ -159,12 +281,16 @@ int wxAppBase::OnRun()
     }
     //else: it has been changed, assume the user knows what he is doing
 
     }
     //else: it has been changed, assume the user knows what he is doing
 

-    return MainLoop();
+    return wxAppConsole::OnRun();

 }
 
 }
 

-void wxAppBase::Exit()
+int wxAppBase::OnExit()

 {
 {

-    ExitMainLoop();
+#ifdef __WXUNIVERSAL__
+    delete wxTheme::Set(NULL);
+#endif // __WXUNIVERSAL__
+
+    return wxAppConsole::OnExit();

 }
 
 wxAppTraits *wxAppBase::CreateTraits()
 }
 
 wxAppTraits *wxAppBase::CreateTraits()


@@ -189,98 +315,50 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 

-void wxAppBase::DeletePendingObjects()
+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)

 {
 {

-    wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = node->GetData();
+    wxWindowDisabler wd(win);

 
 

-        delete obj;
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-        if (wxPendingDelete.Member(obj))
-            wxPendingDelete.Erase(node);
+    return loop && loop->Yield(onlyIfNeeded);
+}

 
 

-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.GetFirst();
-    }
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+    wxWindowDisabler wd(win);
+
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+    return loop && loop->YieldFor(eventsToProcess);

 }
 
 }
 

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

 bool wxAppBase::ProcessIdle()
 {
 bool wxAppBase::ProcessIdle()
 {

+    // call the base class version first to send the idle event to wxTheApp
+    // itself
+    bool needMore = wxAppConsoleBase::ProcessIdle();

     wxIdleEvent event;
     wxIdleEvent event;

-    bool needMore = FALSE;

     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

-    node = wxTopLevelWindows.GetFirst();

     while (node)
     {
         wxWindow* win = node->GetData();
     while (node)
     {
         wxWindow* win = node->GetData();

-        if (SendIdleEvents(win, event))
-            needMore = TRUE;
+        if (win->SendIdleEvents(event))
+            needMore = true;

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

-    event.SetEventObject(this);
-    (void) ProcessEvent(event);
-    if (event.MoreRequested())
-        needMore = TRUE;
-

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

-    
-    return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
-{
-    bool needMore = FALSE;
-
-    win->OnInternalIdle();
-
-    if (wxIdleEvent::CanSend(win))
-    {
-        event.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(event);
-
-        if (event.MoreRequested())
-            needMore = TRUE;
-    }
-    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
-    while ( node )
-    {
-        wxWindow *child = node->GetData();
-        if (SendIdleEvents(child, event))
-            needMore = TRUE;
-
-        node = node->GetNext();
-    }

 
     return needMore;
 }
 
 
     return needMore;
 }
 

-void wxAppBase::OnIdle(wxIdleEvent& event)
-{
-    // If there are pending events, we must process them: pending events
-    // are either events to the threads other than main or events posted
-    // with wxPostEvent() functions
-    // GRG: I have moved this here so that all pending events are processed
-    //   before starting to delete any objects. This behaves better (in
-    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
-    //   behaviour. Changed Feb/2000 before 2.1.14
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close().
-    DeletePendingObjects();
-
-#if wxUSE_LOG
-    // flush the logged messages if any
-    wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-}
-

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


@@ -289,7 +367,16 @@ void wxAppBase::OnIdle(wxIdleEvent& event)
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

+#if wxUSE_LOGGUI
+#ifndef __WXOSX_IPHONE__

     return new wxLogGui;
     return new wxLogGui;

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

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


@@ -300,15 +387,18 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)
     // is (according to common practice):
     //     - console apps: to stderr (on any platform)
     //     - GUI apps: stderr on Unix platforms (!)

-    //                 message box under Windows and others
+    //                 stderr if available and message box otherwise on others
+    //                 (currently stderr only Windows if app running from console)

 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__
     // wxMessageOutputMessageBox doesn't work under Motif
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;
 #ifdef __UNIX__
     return new wxMessageOutputStderr;
 #else // !__UNIX__
     // wxMessageOutputMessageBox doesn't work under Motif
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;

+    #elif wxUSE_MSGDLG
+        return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);

     #else
     #else

-        return new wxMessageOutputMessageBox;
+        return new wxMessageOutputStderr;

     #endif
 #endif // __UNIX__/!__UNIX__
 }
     #endif
 #endif // __UNIX__/!__UNIX__
 }


@@ -322,43 +412,65 @@ wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
 
 #endif // wxUSE_FONTMAP
 

-#ifdef __WXDEBUG__
+wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
+{
+    // use the default native renderer by default
+    return NULL;
+}

 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 {

+#if wxDEBUG_LEVEL

     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()
     // under MSW we prefer to use the base class version using ::MessageBox()
     // even if wxMessageBox() is available because it has less chances to
     // double fault our app than our wxMessageBox()

-#if defined(__WXMSW__) || !wxUSE_MSGDLG
-    return wxAppTraitsBase::ShowAssertDialog(msg);
-#else // wxUSE_MSGDLG
-    // this message is intentionally not translated -- it is for
-    // developpers only
-    wxString msgDlg(msg);
-    msgDlg += wxT("\nDo you want to stop the program?\n")
-              wxT("You can also choose [Cancel] to suppress ")
-              wxT("further warnings.");
-
-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
-                          wxYES_NO | wxCANCEL | wxICON_STOP ) )
-    {
-        case wxYES:
-            wxTrap();
-            break;
+    //
+    // under DFB the message dialog is not always functional right now
+    //
+    // and finally we can't use wxMessageBox() if it wasn't compiled in, of
+    // course
+#if !defined(__WXMSW__) && !defined(__WXDFB__) && wxUSE_MSGDLG

 
 

-        case wxCANCEL:
-            // no more asserts
-            return true;
+    // we can't (safely) show the GUI dialog from another thread, only do it
+    // for the asserts in the main thread
+    if ( wxIsMainThread() )
+    {
+        wxString msgDlg = msg;
+
+#if wxUSE_STACKWALKER
+        const wxString stackTrace = GetAssertStackTrace();
+        if ( !stackTrace.empty() )
+            msgDlg << wxT("\n\nCall stack:\n") << stackTrace;
+#endif // wxUSE_STACKWALKER
+
+        // this message is intentionally not translated -- it is for
+        // developpers only
+        msgDlg += wxT("\nDo you want to stop the program?\n")
+                  wxT("You can also choose [Cancel] to suppress ")
+                  wxT("further warnings.");
+
+        switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) )
+        {
+            case wxYES:
+                wxTrap();
+                break;
+
+            case wxCANCEL:
+                // no more asserts
+                return true;
+
+            //case wxNO: nothing to do
+        }

 
 

-        //case wxNO: nothing to do
+        return false;

     }
     }

+#endif // wxUSE_MSGDLG
+#endif // wxDEBUG_LEVEL

 
 

-    return false;
-#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
+    return wxAppTraitsBase::ShowAssertDialog(msg);

 }
 
 }
 

-#endif // __WXDEBUG__
-

 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the
 bool wxGUIAppTraitsBase::HasStderr()
 {
     // we consider that under Unix stderr always goes somewhere, even if the


@@ -370,14 +482,3 @@ bool wxGUIAppTraitsBase::HasStderr()
 #endif
 }
 
 #endif
 }
 

-void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object)
-{
-    if ( !wxPendingDelete.Member(object) )
-        wxPendingDelete.Append(object);
-}
-
-void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
-{
-    wxPendingDelete.DeleteObject(object);
-}
-