TreeTest compiles again,

  Found flickering bug wrt cursors.

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

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index d05b16edafe3bb9d863d6a81923c13055a5ab79a..29098cf083911ec2eec682f4f163cc9bf28852bd 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -285,7 +285,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
 
     int i = m_treeCtrl->GetChildrenCount( item, FALSE );
     
-    wxLogMessage(T("%d children"), i);
+    wxLogMessage(wxT("%d children"), i);
 }
 
 void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
@@ -296,7 +296,7 @@ void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
 
     int i = m_treeCtrl->GetChildrenCount( item );
     
-    wxLogMessage(T("%d children"), i);
+    wxLogMessage(wxT("%d children"), i);
 }
 
 void MyFrame::DoSort(bool reverse)
@@ -324,7 +324,7 @@ void MyFrame::OnDumpSelected(wxCommandEvent& WXUNUSED(event))
     wxArrayTreeItemIds array;
 
     size_t count = m_treeCtrl->GetSelections(array);
-    wxLogMessage(T("%u items selected"), count);
+    wxLogMessage(wxT("%u items selected"), count);
 
     for ( size_t n = 0; n < count; n++ )
     {

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 66fbb33bd5eac4198516418ba062c88697560653..8a2fcc64919c74b599cbe586c5d3a70f518f1596 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -946,7 +946,7 @@ void wxTextCtrl::OnInternalIdle()
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;
-        if (window)
+        if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
             gdk_window_set_cursor( window, cursor.GetCursor() );
     }
 }

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 66fbb33bd5eac4198516418ba062c88697560653..8a2fcc64919c74b599cbe586c5d3a70f518f1596 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -946,7 +946,7 @@ void wxTextCtrl::OnInternalIdle()
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;
-        if (window)
+        if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
             gdk_window_set_cursor( window, cursor.GetCursor() );
     }
 }