From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 13 May 2002 16:54:32 +0000 (+0000)
Subject: textctrl.cpp: Removed assert from CanRedo/CanUndo since the best behaviour is
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4855a4773e9a49c6bb70f1adc3da7109e0b6ccf7

textctrl.cpp: Removed assert from CanRedo/CanUndo since the best behaviour is
to return FALSE (Redo/Undo functions are unimplemented)
treectrlg.cpp: in InsertItem, allow previous item to be null in order
to insert at first position of possibly-empty child list
dcclient.cpp: allow setting of null font (common espec. on Windows)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 79a9facb90..92610cada4 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1246,9 +1246,13 @@ wxTreeItemId wxGenericTreeCtrl::InsertItem(const wxTreeItemId& parentId,
         return AddRoot(text, image, selImage, data);
     }
 
-    int index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
-    wxASSERT_MSG( index != wxNOT_FOUND,
-                  wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
+    int index = -1;
+    if (idPrevious.IsOk())
+    {
+        index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
+        wxASSERT_MSG( index != wxNOT_FOUND,
+                      wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
+    }
 
     return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 736b8a1332..5af43d6f27 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1594,7 +1594,9 @@ void wxWindowDC::Clear()
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
-    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+    // It is common practice to set the font to wxNullFont, so
+    // don't consider it to be an error
+    //    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
 
     m_font = font;
 #ifdef __WXGTK20__
diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index bfa26d0b92..a655706aa5 100644
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -929,14 +929,14 @@ void wxTextCtrl::Redo()
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
     return FALSE;
 }
 
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 736b8a1332..5af43d6f27 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1594,7 +1594,9 @@ void wxWindowDC::Clear()
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
-    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+    // It is common practice to set the font to wxNullFont, so
+    // don't consider it to be an error
+    //    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
 
     m_font = font;
 #ifdef __WXGTK20__
diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index bfa26d0b92..a655706aa5 100644
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -929,14 +929,14 @@ void wxTextCtrl::Redo()
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
-    wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+    //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
     return FALSE;
 }