don't complain if file doesn't exist in DeleteFile(); do return false if it exists...

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 98e2f3b09d20e52e117eddcec5a569c2d4c5c801..56f3a233833e029fcc4d451dfadb32e08ca2d2a1 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -8,15 +8,20 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

-#include "wx/listbox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"

 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"

 #include "wx/dynarray.h"
 #include "wx/dynarray.h"

+#include "wx/arrstr.h"

 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"


@@ -38,24 +43,6 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 

-//-----------------------------------------------------------------------------
-// private functions
-//-----------------------------------------------------------------------------
-
-#if wxUSE_CHECKLISTBOX
-
-// checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (NB: 4 below is the length of wxCHECKLBOX_STRING above)
-//
-// the argument to it is a "const char *" pointer
-#define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
-
-#else // !wxUSE_CHECKLISTBOX
-
-#define GET_REAL_LABEL(label) (label)
-
-#endif // wxUSE_CHECKLISTBOX
-

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -261,21 +248,22 @@ static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbo
     gtk_listitem_select_cb( widget, listbox, FALSE );
 }
 
     gtk_listitem_select_cb( widget, listbox, FALSE );
 }
 

-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection )
+static void gtk_listitem_select_cb( GtkWidget *widget,
+                                    wxListBox *listbox,
+                                    bool is_selection )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-    
+

     if (listbox->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );
     if (listbox->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );

-    
-//    MSW doesn't do that either
-//    event.SetExtraLong( (long) is_selection );

 
 

+    // indicate whether this is a selection or a deselection
+    event.SetExtraLong( is_selection );

 
     if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
     {
 
     if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
     {


@@ -431,6 +419,10 @@ wxListBox::~wxListBox()
       delete m_strings;
 }
 
       delete m_strings;
 }
 

+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
+

 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );


@@ -461,7 +453,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
             if (index != GetCount())
             {
                 GtkAddItem( items[n], index );
             if (index != GetCount())
             {
                 GtkAddItem( items[n], index );

-                wxNode *node = m_clientList.Nth( index );
+                wxList::compatibility_iterator node = m_clientList.Item( index );

                 m_clientList.Insert( node, (wxObject*) NULL );
             }
             else
                 m_clientList.Insert( node, (wxObject*) NULL );
             }
             else


@@ -484,7 +476,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
         }
         else
         {
         }
         else
         {

-            wxNode *node = m_clientList.Nth( pos );
+            wxList::compatibility_iterator node = m_clientList.Item( pos );

             for ( size_t n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n], pos+n );
             for ( size_t n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n], pos+n );


@@ -510,7 +502,7 @@ int wxListBox::DoAppend( const wxString& item )
         {
            GtkAddItem( item, index );
 
         {
            GtkAddItem( item, index );
 

-           wxNode *node = m_clientList.Nth( index );
+           wxList::compatibility_iterator node = m_clientList.Item( index );

            m_clientList.Insert( node, (wxObject *)NULL );
 
            return index;
            m_clientList.Insert( node, (wxObject *)NULL );
 
            return index;


@@ -612,59 +604,15 @@ void wxListBox::DoSetItems( const wxArrayString& items,
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// client data
+// deleting items

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetItemClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxListBox::DoGetItemClientData( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
-
-    return node->Data();
-}
-
-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    delete cd;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
-
-    return (wxClientData*) node->Data();
-}
-

 void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );
 void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );

-    
+

     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
         // This should be NULL, I think.
     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
         // This should be NULL, I think.


@@ -676,11 +624,11 @@ void wxListBox::Clear()
         // destroy the data (due to Robert's idea of using wxList<wxObject>
         // and not wxList<wxClientData> we can't just say
         // m_clientList.DeleteContents(TRUE) - this would crash!
         // destroy the data (due to Robert's idea of using wxList<wxObject>
         // and not wxList<wxClientData> we can't just say
         // m_clientList.DeleteContents(TRUE) - this would crash!

-        wxNode *node = m_clientList.First();
+        wxList::compatibility_iterator node = m_clientList.GetFirst();

         while ( node )
         {
         while ( node )
         {

-            delete (wxClientData *)node->Data();
-            node = node->Next();
+            delete (wxClientData *)node->GetData();
+            node = node->GetNext();

         }
     }
     m_clientList.Clear();
         }
     }
     m_clientList.Clear();


@@ -701,26 +649,97 @@ void wxListBox::Delete( int n )
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 

-    wxNode *node = m_clientList.Nth( n );
+    wxList::compatibility_iterator node = m_clientList.Item( n );

     if ( node )
     {
         if ( m_clientDataItemsType == wxClientData_Object )
         {
     if ( node )
     {
         if ( m_clientDataItemsType == wxClientData_Object )
         {

-            wxClientData *cd = (wxClientData*)node->Data();
+            wxClientData *cd = (wxClientData*)node->GetData();

             delete cd;
         }
 
             delete cd;
         }
 

-        m_clientList.DeleteNode( node );
+        m_clientList.Erase( node );

     }
 
     if ( m_strings )
     }
 
     if ( m_strings )

-        m_strings->Remove(n);
+        m_strings->RemoveAt(n);
+}
+
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxListBox::DoSetItemClientData( int n, void* clientData )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
+
+    node->SetData( (wxObject*) clientData );
+}
+
+void* wxListBox::DoGetItemClientData( int n ) const
+{
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
+
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
+
+    return node->GetData();
+}
+
+void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
+
+    // wxItemContainer already deletes data for us
+
+    node->SetData( (wxObject*) clientData );
+}
+
+wxClientData* wxListBox::DoGetItemClientObject( int n ) const
+{
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
+
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
+
+    return (wxClientData*) node->GetData();

 }
 
 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------
 

+wxString wxListBox::GetRealLabel(GList *item) const
+{
+    GtkBin *bin = GTK_BIN( item->data );
+    GtkLabel *label = GTK_LABEL( bin->child );
+
+    wxString str;
+
+#ifdef __WXGTK20__
+    str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    str = wxString( label->label );
+#endif
+
+#if wxUSE_CHECKLISTBOX
+    // checklistboxes have "[±] " prepended to their lables, remove it
+    //
+    // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h
+    if ( m_hasCheckBoxes )
+        str.erase(0, 4);
+#endif // wxUSE_CHECKLISTBOX
+
+    return str;
+}
+

 void wxListBox::SetString( int n, const wxString &string )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 void wxListBox::SetString( int n, const wxString &string )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );


@@ -753,12 +772,7 @@ wxString wxListBox::GetString( int n ) const
     GList *child = g_list_nth( m_list->children, n );
     if (child)
     {
     GList *child = g_list_nth( m_list->children, n );
     if (child)
     {

-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-        wxString str = wxGTK_CONV_BACK(  GET_REAL_LABEL(label->label) );
-
-        return str;
+        return GetRealLabel(child);

     }
 
     wxFAIL_MSG(wxT("wrong listbox index"));
     }
 
     wxFAIL_MSG(wxT("wrong listbox index"));


@@ -782,12 +796,7 @@ int wxListBox::FindString( const wxString &item ) const
     int count = 0;
     while (child)
     {
     int count = 0;
     while (child)
     {

-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-        wxString str = wxGTK_CONV_BACK( GET_REAL_LABEL(label->label) );
-
-        if (str == item)
+        if ( GetRealLabel(child) == item )

             return count;
 
         count++;
             return count;
 
         count++;


@@ -875,7 +884,7 @@ void wxListBox::SetSelection( int n, bool select )
     else
         gtk_list_unselect_item( m_list, n );
 
     else
         gtk_list_unselect_item( m_list, n );
 

-    m_blockEvent = FALSE;    
+    m_blockEvent = FALSE;

 }
 
 void wxListBox::DoSetFirstItem( int n )
 }
 
 void wxListBox::DoSetFirstItem( int n )


@@ -912,7 +921,7 @@ void wxListBox::DoSetFirstItem( int n )
     float y = item->allocation.y;
     if (y > adjustment->upper - adjustment->page_size)
         y = adjustment->upper - adjustment->page_size;
     float y = item->allocation.y;
     if (y > adjustment->upper - adjustment->page_size)
         y = adjustment->upper - adjustment->page_size;

-       gtk_adjustment_set_value( adjustment, y );
+    gtk_adjustment_set_value( adjustment, y );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -954,6 +963,8 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {

+    if (m_widget->window == window) return TRUE;
+

     if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;


@@ -1033,7 +1044,8 @@ void wxListBox::OnInternalIdle()
         }
     }
 
         }
     }
 

-    UpdateWindowUI();
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -1054,7 +1066,7 @@ wxSize wxListBox::DoGetBestSize() const
 
     // And just a bit more
     int cx, cy;
 
     // And just a bit more
     int cx, cy;

-    GetTextExtent("X", &cx, &cy);
+    GetTextExtent( wxT("X"), &cx, &cy);

     lbWidth += 3 * cx;
 
     // don't make the listbox too tall (limit height to around 10 items) but don't
     lbWidth += 3 * cx;
 
     // don't make the listbox too tall (limit height to around 10 items) but don't