updated license info: Remstar gace permission to change it to wxWindows License with...

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 99708fd85e0f7fdd4aaaee8cadfa79d56cfa14a2..31fc28facb2ef3fd0b8e9d419521a2b7e7be983d 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -28,20 +28,14 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/list.h"

-    #if wxUSE_LOG
-        #include "wx/log.h"
-    #endif // wxUSE_LOG
+    #include "wx/log.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/utils.h"

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

-#if wxUSE_FILENAME
-    #include "wx/filename.h"
-#endif // wxUSE_FILENAME
-#if wxUSE_FONTMAP
-    #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
+#include "wx/filename.h"

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


@@ -50,9 +44,13 @@
 #endif  //Win/Unix
 
 #if defined(__WXMSW__)
 #endif  //Win/Unix
 
 #if defined(__WXMSW__)

-  #include  "wx/msw/private.h"  // includes windows.h for MessageBox()
+  #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()

 #endif
 
 #endif
 

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

 #if defined(__WXMAC__)
     // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
     //     I don't know which headers are needed under earlier systems so
 #if defined(__WXMAC__)
     // VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
     //     I don't know which headers are needed under earlier systems so


@@ -89,7 +87,7 @@
 // global vars
 // ----------------------------------------------------------------------------
 
 // global vars
 // ----------------------------------------------------------------------------
 

-wxApp *wxTheApp = NULL;
+wxAppConsole *wxAppConsole::ms_appInstance = NULL;

 
 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 
 
 wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
 


@@ -105,10 +103,17 @@ wxAppConsole::wxAppConsole()
 {
     m_traits = NULL;
 
 {
     m_traits = NULL;
 

-    wxTheApp = (wxApp *)this;
+    ms_appInstance = this;

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

+#if wxUSE_UNICODE
+    // In unicode mode the SetTraceMasks call can cause an apptraits to be
+    // created, but since we are still in the constructor the wrong kind will
+    // be created for GUI apps.  Destroy it so it can be created again later.
+    delete m_traits;
+    m_traits = NULL;
+#endif

 #endif
 }
 
 #endif
 }
 


@@ -121,20 +126,24 @@ wxAppConsole::~wxAppConsole()
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 
 // initilization/cleanup
 // ----------------------------------------------------------------------------
 

-bool wxAppConsole::Initialize(int argc, wxChar **argv)
+bool wxAppConsole::Initialize(int& argc, wxChar **argv)

 {
 {

+#if wxUSE_LOG 
+    // If some code logged something before wxApp instance was created,
+    // wxLogStderr was set as the target. Undo it here by destroying the
+    // current target. It will be re-created next time logging is needed, but
+    // this time wxAppTraits will be used:
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+    

     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;
 
     // remember the command line arguments
     this->argc = argc;
     this->argv = argv;
 

-    if ( m_appName.empty() )
+    if ( m_appName.empty() && argv )

     {
         // the application name is, by default, the name of its executable file
     {
         // the application name is, by default, the name of its executable file

-#if wxUSE_FILENAME

         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);

-#else // !wxUSE_FILENAME
-        m_appName = argv[0];
-#endif // wxUSE_FILENAME/!wxUSE_FILENAME

     }
 
     return true;
     }
 
     return true;


@@ -186,10 +195,6 @@ int wxAppConsole::OnExit()
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 #endif // wxUSE_CONFIG
 
     delete wxConfigBase::Set((wxConfigBase *) NULL);
 #endif // wxUSE_CONFIG
 

-#ifdef __WXUNIVERSAL__
-    delete wxTheme::Set(NULL);
-#endif // __WXUNIVERSAL__
-

     // use Set(NULL) and not Get() to avoid creating a message output object on
     // demand when we just want to delete it
     delete wxMessageOutput::Set(NULL);
     // use Set(NULL) and not Get() to avoid creating a message output object on
     // demand when we just want to delete it
     delete wxMessageOutput::Set(NULL);


@@ -208,7 +213,7 @@ void wxAppConsole::Exit()
 
 wxAppTraits *wxAppConsole::CreateTraits()
 {
 
 wxAppTraits *wxAppConsole::CreateTraits()
 {

-    return wxAppTraits::CreateConsole();
+    return new wxConsoleAppTraits;

 }
 
 wxAppTraits *wxAppConsole::GetTraits()
 }
 
 wxAppTraits *wxAppConsole::GetTraits()


@@ -261,11 +266,11 @@ void wxAppConsole::ProcessPendingEvents()
     }
 
     // iterate until the list becomes empty
     }
 
     // iterate until the list becomes empty

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

     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->GetData();

-        delete node;
+        wxPendingEvents->Erase(node);

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


@@ -285,6 +290,34 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
     return -1;
 }
 
     return -1;
 }
 

+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXCEPTIONS
+
+void
+wxAppConsole::HandleEvent(wxEvtHandler *handler,
+                          wxEventFunction func,
+                          wxEvent& event) const
+{
+    // by default, simply call the handler
+    (handler->*func)(event);
+}
+
+bool
+wxAppConsole::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
+

 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------


@@ -292,8 +325,6 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
 #if wxUSE_CMDLINE_PARSER
 
 #define OPTION_VERBOSE _T("verbose")
 #if wxUSE_CMDLINE_PARSER
 
 #define OPTION_VERBOSE _T("verbose")

-#define OPTION_THEME   _T("theme")
-#define OPTION_MODE    _T("mode")

 
 void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
 {
 
 void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
 {


@@ -320,31 +351,6 @@ void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
         },
 #endif // wxUSE_LOG
 
         },
 #endif // wxUSE_LOG
 

-#ifdef __WXUNIVERSAL__
-        {
-            wxCMD_LINE_OPTION,
-            _T(""),
-            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,
-            _T(""),
-            OPTION_MODE,
-            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
-            wxCMD_LINE_VAL_STRING,
-            0x0
-        },
-#endif // __WXMGL__
-

         // terminator
         {
             wxCMD_LINE_NONE,
         // terminator
         {
             wxCMD_LINE_NONE,


@@ -364,44 +370,13 @@ bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
     {
 #if wxUSE_LOG
     if ( parser.Found(OPTION_VERBOSE) )
     {

-        wxLog::SetVerbose(TRUE);
+        wxLog::SetVerbose(true);

     }
     }

+#else
+    wxUnusedVar(parser);

 #endif // wxUSE_LOG
 
 #endif // wxUSE_LOG
 

-#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(wxDisplayModeInfo(w, h, bpp)) )
-            return FALSE;
-    }
-#endif // __WXMGL__
-
-    return TRUE;
+    return true;

 }
 
 bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
 }
 
 bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)


@@ -425,39 +400,25 @@ bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
 // ----------------------------------------------------------------------------
 
 /* static */
 // ----------------------------------------------------------------------------
 
 /* static */

-bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& opts)
+bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
+                                     const char *componentName)

 {
 {

-#define wxCMP(what)   (what == opts.m_ ## what)
-
-    bool
-#ifdef __WXDEBUG__
-    isDebug = TRUE;
-#else
-    isDebug = FALSE;
+#if 0 // can't use wxLogTrace, not up and running yet
+    printf("checking build options object '%s' (ptr %p) in '%s'\n",
+             optionsSignature, optionsSignature, componentName);

 #endif
 
 #endif
 

-    int verMaj = wxMAJOR_VERSION,
-        verMin = wxMINOR_VERSION;
-
-    if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
+    if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )

     {
     {

+        wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
+        wxString prog = wxString::FromAscii(optionsSignature);
+        wxString progName = wxString::FromAscii(componentName);

         wxString msg;
         wxString msg;

-        wxString libDebug, progDebug;
-
-        if (isDebug)
-            libDebug = wxT("debug");
-        else
-            libDebug = wxT("no debug");
-
-        if (opts.m_isDebug)
-            progDebug = wxT("debug");
-        else
-            progDebug = wxT("no debug");
-        
-        msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %d.%d (%s), and your program used %d.%d (%s)."),
-                   verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
-        
-        wxLogFatalError(msg);
+
+        msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                   lib.c_str(), progName.c_str(), prog.c_str());
+
+        wxLogFatalError(msg.c_str());

 
         // normally wxLogFatalError doesn't return
         return FALSE;
 
         // normally wxLogFatalError doesn't return
         return FALSE;


@@ -474,7 +435,7 @@ void wxAppConsole::OnAssert(const wxChar *file,
                             const wxChar *cond,
                             const wxChar *msg)
 {
                             const wxChar *cond,
                             const wxChar *msg)
 {

-    ShowAssertDialog(file, line, cond, msg, m_traits);
+    ShowAssertDialog(file, line, cond, msg, GetTraits());

 }
 
 #endif // __WXDEBUG__
 }
 
 #endif // __WXDEBUG__


@@ -510,6 +471,12 @@ wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
 
 #endif // wxUSE_FONTMAP
 
 
 #endif // wxUSE_FONTMAP
 

+wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer()
+{
+    // console applications don't use renderers
+    return NULL;
+}
+

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


@@ -533,6 +500,13 @@ void wxConsoleAppTraitsBase::RemoveFromPendingDelete(wxObject * WXUNUSED(object)
     // nothing to do
 }
 
     // nothing to do
 }
 

+#if wxUSE_SOCKETS
+GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
+{
+    return NULL;
+}
+#endif
+

 // ----------------------------------------------------------------------------
 // wxAppTraits
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxAppTraits
 // ----------------------------------------------------------------------------


@@ -546,11 +520,6 @@ bool wxAppTraitsBase::ShowAssertDialog(const wxString& msg)
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

-wxAppTraits *wxAppTraitsBase::CreateConsole()
-{
-    return new wxConsoleAppTraits;
-}
-

 // ============================================================================
 // global functions implementation
 // ============================================================================
 // ============================================================================
 // global functions implementation
 // ============================================================================


@@ -607,7 +576,7 @@ void wxAssert(int cond,
               const wxChar *szFile,
               int nLine,
               const wxChar *szCond,
               const wxChar *szFile,
               int nLine,
               const wxChar *szCond,

-              const wxChar *szMsg) 
+              const wxChar *szMsg)

 {
     if ( !cond )
         wxOnAssert(szFile, nLine, szCond, szMsg);
 {
     if ( !cond )
         wxOnAssert(szFile, nLine, szCond, szMsg);


@@ -682,7 +651,7 @@ bool DoShowAssertDialog(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 ( ::MessageBox(NULL, msgDlg, _T("wxWindows Debug Alert"),
+    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),

                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:
                           MB_YESNOCANCEL | MB_ICONSTOP ) )
     {
         case IDYES:


@@ -758,7 +727,7 @@ void ShowAssertDialog(const wxChar *szFile,
     if ( !s_bNoAsserts )
     {
         // send it to the normal log destination
     if ( !s_bNoAsserts )
     {
         // send it to the normal log destination

-        wxLogDebug(_T("%s"), msg);
+        wxLogDebug(_T("%s"), msg.c_str());

 
         if ( traits )
         {
 
         if ( traits )
         {