revert togglable tools to previous state if the change was vetoed by OnLeftClick()

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4ff6242196d5f921b8d76553ed6bf42062d377f2..ef63f6206ebc740d6db803bb8b919e7fe70508cb 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -188,7 +188,7 @@ static char *fallbackResources[] = {
 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )
-        return FALSE;
+        return false;
 
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
@@ -207,7 +207,7 @@ bool wxApp::OnInitGui()
          // if you don't log to stderr, nothing will be shown...
         delete wxLog::SetActiveTarget(new wxLogStderr);
         wxString className(wxTheApp->GetClassName());
-        wxLogError(_("wxWindows could not open display for '%s': exiting."),
+        wxLogError(_("wxWidgets could not open display for '%s': exiting."),
                    className.c_str());
         exit(-1);
     }
@@ -228,7 +228,7 @@ bool wxApp::OnInitGui()
 
     wxAddIdleCallback();
 
-    return TRUE;
+    return true;
 }
 
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
@@ -360,7 +360,7 @@ void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget)
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    static bool s_inYield = FALSE;
+    static bool s_inYield = false;
 
     if ( s_inYield )
     {
@@ -369,17 +369,17 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
-        return FALSE;
+        return false;
     }
 
-    s_inYield = TRUE;
+    s_inYield = true;
 
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
 
-    s_inYield = FALSE;
+    s_inYield = false;
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------