Applied patch [ 705663 ] Fix capture mouse bug in wxGrid

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 11493d4ba968450a9de33880f6ebf6b9026c254e..e22ebf4a3395befa5e3716b9ec0c7cbb847dc1e2 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -377,10 +377,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         wxTheme *theme = wxTheme::Create(themeName);
         if ( !theme )
         {
         wxTheme *theme = wxTheme::Create(themeName);
         if ( !theme )
         {

-#if wxUSE_LOG

             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());

-#endif
-

             return FALSE;
         }
 
             return FALSE;
         }
 


@@ -397,9 +394,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         unsigned w, h, bpp;
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
         unsigned w, h, bpp;
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {

-#if wxUSE_LOG

             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());

-#endif

             return FALSE;
         }
 
             return FALSE;
         }
 


@@ -464,9 +459,7 @@ bool wxAppBase::CheckBuildOptions(const wxBuildOptions& opts)
         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 %d.%d (%s), and your program used %d.%d (%s)."),
                    verMaj, verMin, libDebug.c_str(), opts.m_verMaj, opts.m_verMin, progDebug.c_str());
         

-#if wxUSE_LOG

         wxLogFatalError(msg);
         wxLogFatalError(msg);

-#endif

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


@@ -557,10 +550,8 @@ void ShowAssertDialog(const wxChar *szFile,
 
     if ( !s_bNoAsserts )
     {
 
     if ( !s_bNoAsserts )
     {

-#if wxUSE_LOG

         // send it to the normal log destination
         wxLogDebug(szBuf);
         // send it to the normal log destination
         wxLogDebug(szBuf);

-#endif

 
 #if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)
         // this message is intentionally not translated - it is for
 
 #if (wxUSE_GUI && wxUSE_MSGDLG) || defined(__WXMSW__)
         // this message is intentionally not translated - it is for