moved OLE files group under MSW files -- this is more logical

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index cfd1d3df1408d8896c34a66d6b1bf642bbc34d76..70d6b43e57e2248b8139291d361b85904750f375 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -121,9 +121,6 @@ bool wxAppBase::OnInitGui()
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
         return FALSE;
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
         return FALSE;

-    wxArtProvider *art = wxTheme::Get()->GetArtProvider();
-    if ( art )
-        wxArtProvider::PushProvider(art);

 #endif // __WXUNIVERSAL__
 
     return TRUE;
 #endif // __WXUNIVERSAL__
 
     return TRUE;


@@ -215,10 +212,10 @@ void wxAppBase::ProcessPendingEvents()
     }
 
     // iterate until the list becomes empty
     }
 
     // iterate until the list becomes empty

-    wxNode *node = wxPendingEvents->First();
+    wxNode *node = wxPendingEvents->GetFirst();

     while (node)
     {
     while (node)
     {

-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+        wxEvtHandler *handler = (wxEvtHandler *)node->GetData();

         delete node;
 
         // In ProcessPendingEvents(), new handlers might be add
         delete node;
 
         // In ProcessPendingEvents(), new handlers might be add


@@ -227,7 +224,7 @@ void wxAppBase::ProcessPendingEvents()
         handler->ProcessPendingEvents();
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 
         handler->ProcessPendingEvents();
         wxENTER_CRIT_SECT( *wxPendingEventsLocker );
 

-        node = wxPendingEvents->First();
+        node = wxPendingEvents->GetFirst();

     }
 
     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
     }
 
     wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );


@@ -385,6 +382,8 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
             return FALSE;
         }
 
             return FALSE;
         }
 

+        // Delete the defaultly created theme and set the new theme.
+        delete wxTheme::Get();

         wxTheme::Set(theme);
     }
 #endif // __WXUNIVERSAL__
         wxTheme::Set(theme);
     }
 #endif // __WXUNIVERSAL__


@@ -446,8 +445,23 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
 
     if ( !(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."));
+        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);

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


@@ -461,6 +475,7 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
 
 static void LINKAGEMODE SetTraceMasks()
 {
 
 static void LINKAGEMODE SetTraceMasks()
 {

+#if wxUSE_LOG

     wxString mask;
     if ( wxGetEnv(wxT("WXTRACE"), &mask) )
     {
     wxString mask;
     if ( wxGetEnv(wxT("WXTRACE"), &mask) )
     {


@@ -468,6 +483,7 @@ static void LINKAGEMODE SetTraceMasks()
         while ( tkn.HasMoreTokens() )
             wxLog::AddTraceMask(tkn.GetNextToken());
     }
         while ( tkn.HasMoreTokens() )
             wxLog::AddTraceMask(tkn.GetNextToken());
     }

+#endif // wxUSE_LOG

 }
 
 // wxASSERT() helper
 }
 
 // wxASSERT() helper