Changed two conflicting defines in defs.h

[wxWidgets.git] / src / gtk1 / listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index d981ae99dd0c0bb2766bce429596d41ba839c5ef..b4652068770b5345fb3f6dce4d1a1162bd505e23 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -259,7 +259,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
-        wxFAIL_MSG( _T("wxListBox creation failed") );
+        wxFAIL_MSG( wxT("wxListBox creation failed") );
        return FALSE;
     }
 
@@ -291,6 +291,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 
+    /* make list scroll when moving the focus down using cursor keys */
+    gtk_container_set_focus_vadjustment(
+        GTK_CONTAINER(m_list),
+        gtk_scrolled_window_get_vadjustment(
+           GTK_SCROLLED_WINDOW(m_widget)));
+
     gtk_widget_show( GTK_WIDGET(m_list) );
 
     wxSize newSize = size;
@@ -369,11 +375,11 @@ wxListBox::~wxListBox()
 
 void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GList *children = m_list->children;
     int length = g_list_length(children);
-    wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") );
+    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
 
     // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
     //     into a listbox at the given position, this is why we first delete
@@ -471,7 +477,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 
 void wxListBox::AppendCommon( const wxString &item )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GtkWidget *list_item;
 
@@ -570,7 +576,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData )
 
 void wxListBox::SetClientData( int n, void* clientData )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return;
@@ -580,7 +586,7 @@ void wxListBox::SetClientData( int n, void* clientData )
 
 void* wxListBox::GetClientData( int n )
 {
-    wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
 
     wxNode *node = m_clientDataList.Nth( n );
     if (!node) return NULL;
@@ -590,7 +596,7 @@ void* wxListBox::GetClientData( int n )
 
 void wxListBox::SetClientObject( int n, wxClientData* clientData )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return;
@@ -603,7 +609,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData )
 
 wxClientData* wxListBox::GetClientObject( int n )
 {
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
 
     wxNode *node = m_clientObjectList.Nth( n );
     if (!node) return (wxClientData*) NULL;
@@ -613,7 +619,7 @@ wxClientData* wxListBox::GetClientObject( int n )
 
 void wxListBox::Clear()
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, Number() );
 
@@ -631,11 +637,11 @@ void wxListBox::Clear()
 
 void wxListBox::Delete( int n )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
 
-    wxCHECK_RET( child, _T("wrong listbox index") );
+    wxCHECK_RET( child, wxT("wrong listbox index") );
 
     GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( m_list, list );
@@ -658,7 +664,7 @@ void wxListBox::Delete( int n )
 
 void wxListBox::Deselect( int n )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     DisableEvents();
 
@@ -669,7 +675,7 @@ void wxListBox::Deselect( int n )
 
 int wxListBox::FindString( const wxString &item ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
@@ -694,7 +700,7 @@ int wxListBox::FindString( const wxString &item ) const
 
 int wxListBox::GetSelection() const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
@@ -709,7 +715,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     // get the number of selected items first
     GList *child = m_list->children;
@@ -739,7 +745,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
 wxString wxListBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
@@ -752,14 +758,14 @@ wxString wxListBox::GetString( int n ) const
         return str;
     }
 
-    wxFAIL_MSG(_T("wrong listbox index"));
+    wxFAIL_MSG(wxT("wrong listbox index"));
 
-    return _T("");
+    return wxT("");
 }
 
 wxString wxListBox::GetStringSelection() const
 {
-    wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
 
     GList *selection = m_list->selection;
     if (selection)
@@ -772,13 +778,13 @@ wxString wxListBox::GetStringSelection() const
         return str;
     }
 
-    wxFAIL_MSG(_T("no listbox selection available"));
-    return _T("");
+    wxFAIL_MSG(wxT("no listbox selection available"));
+    return wxT("");
 }
 
 int wxListBox::Number()
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
@@ -788,7 +794,7 @@ int wxListBox::Number()
 
 bool wxListBox::Selected( int n )
 {
-    wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );
     if (target)
@@ -800,28 +806,28 @@ bool wxListBox::Selected( int n )
             child = child->next;
         }
     }
-    wxFAIL_MSG(_T("wrong listbox index"));
+    wxFAIL_MSG(wxT("wrong listbox index"));
     return FALSE;
 }
 
 void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
 {
-    wxFAIL_MSG(_T("wxListBox::Set not implemented"));
+    wxFAIL_MSG(wxT("wxListBox::Set not implemented"));
 }
 
 void wxListBox::SetFirstItem( int WXUNUSED(n) )
 {
-    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
 }
 
 void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
 {
-    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
 }
 
 void wxListBox::SetSelection( int n, bool select )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     DisableEvents();
 
@@ -835,7 +841,7 @@ void wxListBox::SetSelection( int n, bool select )
 
 void wxListBox::SetString( int n, const wxString &string )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
@@ -854,13 +860,13 @@ void wxListBox::SetString( int n, const wxString &string )
     }
     else
     {
-        wxFAIL_MSG(_T("wrong listbox index"));
+        wxFAIL_MSG(wxT("wrong listbox index"));
     }
 }
 
 void wxListBox::SetStringSelection( const wxString &string, bool select )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     SetSelection( FindString(string), select );
 }
@@ -896,7 +902,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 #if wxUSE_DRAG_AND_DROP
 void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 #ifndef NEW_GTK_DND_CODE
     if (m_dropTarget)
@@ -1011,11 +1017,14 @@ void wxListBox::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
-    if (m_widget->window && cursor.Ok() && m_currentGdkCursor != cursor)
+    if (GTK_WIDGET(m_list)->window && cursor.Ok())
     {
-        m_currentGdkCursor = cursor;
-       
-       gdk_window_set_cursor( GTK_WIDGET(m_list)->window, m_currentGdkCursor.GetCursor() );
+        /* I now set the cursor the anew in every OnInternalIdle call
+          as setting the cursor in a parent window also effects the
+          windows above so that checking for the current cursor is
+          not possible. */
+          
+       gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
 
         GList *child = m_list->children;
         while (child)
@@ -1023,7 +1032,10 @@ void wxListBox::OnInternalIdle()
             GtkBin *bin = GTK_BIN( child->data );
             GtkWidget *label = GTK_WIDGET( bin->child );
            
-           gdk_window_set_cursor( label->window, m_currentGdkCursor.GetCursor() );
+           if (!label->window)
+               break;
+           else
+               gdk_window_set_cursor( label->window, cursor.GetCursor() );
 
             child = child->next;
         }