[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/core (silent)
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2005-03-25 11:29:02
Message-ID: 20050325112902.0CA6F48F () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 

CVS_SILENT crash removed


  M +4 -2      kexidialogbase.cpp   1.109
  M +1 -1      kexiviewbase.h   1.34


--- koffice/kexi/core/kexiviewbase.h  #1.33:1.34
@@ -37,5 +37,5 @@ namespace KexiDB {
  KexiViewBase has 'dirty' flag to indicate that view's data has changed.
  This flag's state is reused by KexiDialogBase object that contain the view.
- KexiViewBase obejcts can be also nested, using addChildView(): any actions and 'dirty' flag
+ KexiViewBase objects can be also nested, using addChildView(): any actions and 'dirty' flag
  are transmited to parent view in this case.
 

--- koffice/kexi/core/kexidialogbase.cpp  #1.108:1.109
@@ -483,6 +483,8 @@ void KexiDialogBase::activate()
         if (Kexi::hasParent( v, KMdiChildView::focusedChildWidget()))//focusWidget()))
                 KMdiChildView::activate();
-        else //ah, focused widget is not in this view, move focus:
+        else {//ah, focused widget is not in this view, move focus:
+                if (v)
                 v->setFocus();
+        }
         if (v)
                 v->updateActions(true);


[prev in list] [next in list] [prev in thread] [next in thread]