fix for always terminating intermediate UniChar String for 4 bytes wchar_t

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 40747cb053edfc32d2d92538f5f7b8beba292f12..706c1c97c892fd40ef326efc181d9a4e02952a81 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -277,6 +277,19 @@ int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
     return -1;
 }
 
     return -1;
 }
 

+#if wxUSE_EXCEPTIONS
+
+void
+wxAppConsole::HandleEvent(wxEvtHandler *handler,
+                          wxEventFunction func,
+                          wxEvent& event) const
+{
+    // by default, simply call the handler
+    (handler->*func)(event);
+}
+
+#endif // wxUSE_EXCEPTIONS
+

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


@@ -357,38 +370,24 @@ 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());
-        
+
+        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);
 
         // normally wxLogFatalError doesn't return
         wxLogFatalError(msg);
 
         // normally wxLogFatalError doesn't return


@@ -406,7 +405,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__


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

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

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


@@ -540,7 +546,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);