added GetWindowSizeForVirtualSize() virtual hook for wxScrolledWindow (cuts down...

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 02643c08e5b858f87805e03429db60009fccf2cd..f4ec68fde9a9d7c353d7b6ae012b52d2f8916119 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -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"
 


@@ -40,18 +36,33 @@
 #endif
 
 #include "wx/apptrait.h"
 #endif
 
 #include "wx/apptrait.h"

+#include "wx/cmdline.h"
+#include "wx/evtloop.h"

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

+#include "wx/ptr_scpd.h"

 
 #if defined(__WXMSW__)
 
 #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
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 
 #endif
 
 #if wxUSE_FONTMAP
     #include "wx/fontmap.h"
 #endif // wxUSE_FONTMAP
 

+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
+
+
+// ----------------------------------------------------------------------------
+// wxEventLoopPtr
+// ----------------------------------------------------------------------------
+
+// this defines wxEventLoopPtr
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
+

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


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

-    m_useBestVisual = FALSE;
-    m_isActive = TRUE;
+    m_useBestVisual = false;
+    m_isActive = true;
+
+#if wxUSE_EVTLOOP_IN_APP
+    m_mainLoop = NULL;
+#endif // wxUSE_EVTLOOP_IN_APP

 
     // 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,18 +87,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


@@ -109,9 +124,19 @@ 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();
 
     wxDeleteStockObjects();
     wxBitmap::CleanUpHandlers();
 
     wxDeleteStockObjects();


@@ -121,20 +146,169 @@ void wxAppBase::CleanUp()
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
     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;
 

-#if wxUSE_VALIDATORS
-    // If we don't do the following, we get an apparent memory leak.
-    ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
-#endif // wxUSE_VALIDATORS
+    #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
 }
 
 #endif // wxUSE_THREADS
 }
 

+#if wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// GUI-specific command line options handling
+// ----------------------------------------------------------------------------
+
+#define OPTION_THEME   _T("theme")
+#define OPTION_MODE    _T("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,
+            wxEmptyString,
+            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,
+            wxEmptyString,
+            OPTION_MODE,
+            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
+            wxCMD_LINE_VAL_STRING,
+            0x0
+        },
+#endif // __WXMGL__
+
+        // terminator
+        {
+            wxCMD_LINE_NONE,
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }
+    };
+
+    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(), _T("%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
+
+// ----------------------------------------------------------------------------
+// main event loop implementation
+// ----------------------------------------------------------------------------
+
+int wxAppBase::MainLoop()
+{
+#if wxUSE_EVTLOOP_IN_APP
+    wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
+
+    return m_mainLoop->Run();
+#else // !wxUSE_EVTLOOP_IN_APP
+    return 0;
+#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
+}
+
+void wxAppBase::ExitMainLoop()
+{
+#if wxUSE_EVTLOOP_IN_APP
+    // we should exit from the main event loop, not just any currently active
+    // (e.g. modal dialog) event loop
+    if ( m_mainLoop && m_mainLoop->IsRunning() )
+    {
+        m_mainLoop->Exit(0);
+    }
+#endif // wxUSE_EVTLOOP_IN_APP
+}
+
+bool wxAppBase::Pending()
+{
+#if wxUSE_EVTLOOP_IN_APP
+    // use the currently active message loop here, not m_mainLoop, because if
+    // we're showing a modal dialog (with its own event loop) currently the
+    // main event loop is not running anyhow
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+
+    return loop && loop->Pending();
+#else // wxUSE_EVTLOOP_IN_APP
+    return false;
+#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
+}
+
+bool wxAppBase::Dispatch()
+{
+#if wxUSE_EVTLOOP_IN_APP
+    // see comment in Pending()
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+
+    return loop && loop->Dispatch();
+#else // wxUSE_EVTLOOP_IN_APP
+    return true;
+#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
+}
+

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


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


@@ -162,6 +336,15 @@ int wxAppBase::OnRun()
     return MainLoop();
 }
 
     return MainLoop();
 }
 

+int wxAppBase::OnExit()
+{
+#ifdef __WXUNIVERSAL__
+    delete wxTheme::Set(NULL);
+#endif // __WXUNIVERSAL__
+
+    return wxAppConsole::OnExit();
+}
+

 void wxAppBase::Exit()
 {
     ExitMainLoop();
 void wxAppBase::Exit()
 {
     ExitMainLoop();


@@ -207,52 +390,51 @@ void wxAppBase::DeletePendingObjects()
     }
 }
 
     }
 }
 

-// 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();
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

-    node = wxTopLevelWindows.GetFirst();

     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))
     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();

+

     if (wxIdleEvent::CanSend(win))
     {
         event.SetEventObject(win);
         win->GetEventHandler()->ProcessEvent(event);
 
         if (event.MoreRequested())
     if (wxIdleEvent::CanSend(win))
     {
         event.SetEventObject(win);
         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();
     }


@@ -260,7 +442,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
     return needMore;
 }
 
     return needMore;
 }
 

-void wxAppBase::OnIdle(wxIdleEvent& event)
+void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))

 {
     // If there are pending events, we must process them: pending events
     // are either events to the threads other than main or events posted
 {
     // If there are pending events, we must process them: pending events
     // are either events to the threads other than main or events posted


@@ -289,7 +471,12 @@ void wxAppBase::OnIdle(wxIdleEvent& 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


@@ -322,6 +509,12 @@ wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
 
 #endif // wxUSE_FONTMAP
 

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

 #ifdef __WXDEBUG__
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
 #ifdef __WXDEBUG__
 
 bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)


@@ -339,7 +532,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:


@@ -381,3 +574,35 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
     wxPendingDelete.DeleteObject(object);
 }
 
     wxPendingDelete.DeleteObject(object);
 }
 

+#if wxUSE_SOCKETS
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/gsockmsw.h"
+#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+    #include "wx/unix/gsockunx.h"
+#elif defined(__WXMAC__)
+  #include <MacHeaders.c>
+  #define OTUNIXERRORS 1
+  #include <OpenTransport.h>
+  #include <OpenTransportProviders.h>
+  #include <OpenTptInternet.h>
+
+  #include "wx/mac/gsockmac.h"
+#else
+    #error "Must include correct GSocket header here"
+#endif
+
+GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
+{
+#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;
+#else // !__WXMAC__ || __DARWIN__
+    static GSocketGUIFunctionsTableConcrete table;
+    return &table;
+#endif // !__WXMAC__ || __DARWIN__
+}
+
+#endif
+