Calss interface updates (wxMotif-only).

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index a53be00281a6a70525a58c3dfe2a90992a83493e..1018cbae7c58828f3002f4e3445b59068f1911e0 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -42,6 +42,7 @@
 #include "wx/confbase.h"
 #include "wx/tokenzr.h"
 #include "wx/utils.h"
 #include "wx/confbase.h"
 #include "wx/tokenzr.h"
 #include "wx/utils.h"

+#include "wx/msgout.h"

 
 #if wxUSE_GUI
     #include "wx/artprov.h"
 
 #if wxUSE_GUI
     #include "wx/artprov.h"


@@ -74,15 +75,6 @@
 
 wxAppBase::wxAppBase()
 {
 
 wxAppBase::wxAppBase()
 {

-    // this function is defined by IMPLEMENT_APP() macro in the user code
-    extern const wxBuildOptions& wxGetBuildOptions();
-
-    if ( !CheckBuildOptions(wxGetBuildOptions()) )
-    {
-        wxLogFatalError(_T("Mismatch between the program and library build ")
-                        _T("versions detected."));
-    }
-

     wxTheApp = (wxApp *)this;
 
 #if WXWIN_COMPATIBILITY_2_2
     wxTheApp = (wxApp *)this;
 
 #if WXWIN_COMPATIBILITY_2_2


@@ -191,12 +183,33 @@ void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 

+int wxAppBase::FilterEvent(wxEvent& WXUNUSED(event))
+{
+    // process the events normally by default
+    return -1;
+}
+
+void wxAppBase::DoInit()
+{
+    if(wxMessageOutput::Get()) return;
+#if wxUSE_GUI
+    #ifdef __WXMOTIF__
+    wxMessageOutput::Set(new wxMessageOutputLog);
+    #else
+    wxMessageOutput::Set(new wxMessageOutputMessageBox);
+    #endif
+#else
+    wxMessageOutput::Set(new wxMessageOutputStderr);
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------
 
 bool wxAppBase::OnInit()
 {
 // ----------------------------------------------------------------------------
 // cmd line parsing
 // ----------------------------------------------------------------------------
 
 bool wxAppBase::OnInit()
 {

+    DoInit();

 #if wxUSE_CMDLINE_PARSER
     wxCmdLineParser parser(argc, argv);
 
 #if wxUSE_CMDLINE_PARSER
     wxCmdLineParser parser(argc, argv);
 


@@ -250,7 +263,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             wxCMD_LINE_SWITCH,
             _T(""),
             OPTION_VERBOSE,
             wxCMD_LINE_SWITCH,
             _T(""),
             OPTION_VERBOSE,

-            gettext_noop("generate verbose log messages")
+            gettext_noop("generate verbose log messages"),
+            wxCMD_LINE_VAL_NONE,
+            0x0

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


@@ -260,7 +275,8 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             _T(""),
             OPTION_THEME,
             gettext_noop("specify the theme to use"),

-            wxCMD_LINE_VAL_STRING
+            wxCMD_LINE_VAL_STRING,
+            0x0

         },
 #endif // __WXUNIVERSAL__
 
         },
 #endif // __WXUNIVERSAL__
 


@@ -273,12 +289,20 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
             _T(""),
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             _T(""),
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),

-            wxCMD_LINE_VAL_STRING
+            wxCMD_LINE_VAL_STRING,
+            0x0

         },
 #endif // __WXMGL__
 
         // terminator
         },
 #endif // __WXMGL__
 
         // terminator

-        { wxCMD_LINE_NONE }
+        {
+            wxCMD_LINE_NONE,
+            _T(""),
+            _T(""),
+            _T(""),
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }

     };
 
     parser.SetDesc(cmdLineDesc);
     };
 
     parser.SetDesc(cmdLineDesc);


@@ -364,9 +388,17 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
     int verMaj = wxMAJOR_VERSION,
         verMin = wxMINOR_VERSION;
 
     int verMaj = wxMAJOR_VERSION,
         verMin = wxMINOR_VERSION;
 

-    return wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin);
+    if ( !(wxCMP(isDebug) && wxCMP(verMaj) && wxCMP(verMin)) )
+    {
+        wxLogFatalError(_T("Mismatch between the program and library build ")
+                        _T("versions detected."));

 
 

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

 #undef wxCMP
 #undef wxCMP

+
+    return TRUE;

 }
 
 #ifdef  __WXDEBUG__
 }
 
 #ifdef  __WXDEBUG__


@@ -408,23 +440,22 @@ void wxTrap()
 
 // show the assert modal dialog
 static
 
 // show the assert modal dialog
 static

-void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
+void ShowAssertDialog(const wxChar *szFile,
+                      int nLine,
+                      const wxChar *szCond,
+                      const wxChar *szMsg)

 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;
 
     wxChar szBuf[4096];
 
 {
     // this variable can be set to true to suppress "assert failure" messages
     static bool s_bNoAsserts = FALSE;
 
     wxChar szBuf[4096];
 

-    // make life easier for people using VC++ IDE: clicking on the message
-    // will take us immediately to the place of the failed assert
+    // make life easier for people using VC++ IDE by using this format: like
+    // this, clicking on the message will take us immediately to the place of
+    // the failed assert

     wxSnprintf(szBuf, WXSIZEOF(szBuf),
     wxSnprintf(szBuf, WXSIZEOF(szBuf),

-#ifdef __VISUALC__
-               wxT("%s(%d): assert failed"),
-#else  // !VC++
-    // make the error message more clear for all the others
-               wxT("Assert failed in file %s at line %d"),
-#endif // VC/!VC
-               szFile, nLine);
+               wxT("%s(%d): assert \"%s\" failed"),
+               szFile, nLine, szCond);

 
     if ( szMsg != NULL )
     {
 
     if ( szMsg != NULL )
     {


@@ -485,7 +516,10 @@ void ShowAssertDialog(const wxChar *szFile, int nLine, const wxChar *szMsg)
 }
 
 // this function is called when an assert fails
 }
 
 // this function is called when an assert fails

-void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
+void wxOnAssert(const wxChar *szFile,
+                int nLine,
+                const wxChar *szCond,
+                const wxChar *szMsg)

 {
     // FIXME MT-unsafe
     static bool s_bInAssert = FALSE;
 {
     // FIXME MT-unsafe
     static bool s_bInAssert = FALSE;


@@ -506,20 +540,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
     {
         // by default, show the assert dialog box - we can't customize this
         // behaviour
     {
         // by default, show the assert dialog box - we can't customize this
         // behaviour

-        ShowAssertDialog(szFile, nLine, szMsg);
+        ShowAssertDialog(szFile, nLine, szCond, szMsg);

     }
     else
     {
         // let the app process it as it wants
     }
     else
     {
         // let the app process it as it wants

-        wxTheApp->OnAssert(szFile, nLine, szMsg);
+        wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);

     }
 
     s_bInAssert = FALSE;
 }
 
     }
 
     s_bInAssert = FALSE;
 }
 

-void wxAppBase::OnAssert(const wxChar *file, int line, const wxChar *msg)
+void wxAppBase::OnAssert(const wxChar *file,
+                         int line,
+                         const wxChar *cond,
+                         const wxChar *msg)

 {
 {

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

 }
 
 #endif  //WXDEBUG
 }
 
 #endif  //WXDEBUG