From 247e5b1632de606eda8fb8f1bc46f9179ba56fb8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 10 Oct 1999 19:56:38 +0000 Subject: [PATCH 1/1] 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 --- samples/treectrl/treetest.cpp | 6 +++--- src/gtk/textctrl.cpp | 2 +- src/gtk1/textctrl.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp index d05b16edaf..29098cf083 100644 --- 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 66fbb33bd5..8a2fcc6491 100644 --- 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 66fbb33bd5..8a2fcc6491 100644 --- 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() ); } } -- 2.45.2