Updates for wxToolbook class

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 31bbf3815a999bea3920816e7af1bc3cf9101303..f88efbcf38a859a20381a33575bb47816aecbdde 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/gtk1/listbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -26,7 +21,7 @@
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"
@@ -111,7 +106,7 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
     {
         // not yet, notify it
         win->m_hasFocus = TRUE;
-        
+
         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 
@@ -252,9 +247,9 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
             for (i = 0; i < (int)listbox->GetCount(); i++)
                 if (i != sel)
                     gtk_list_unselect_item( GTK_LIST(listbox->m_list), i );
-                
+
             listbox->m_blockEvent = FALSE;
-            
+
             return false;
     }
 
@@ -315,21 +310,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE
-    if ((gdk_event->keyval == ' ') && (!ret) && 
+    if ((gdk_event->keyval == ' ') && (!ret) &&
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );
-        
+
         if (sel != -1)
         {
             ret = TRUE;
-            
+
             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );
-            
+
             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;
@@ -351,7 +346,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }
-    
+
     if (ret)
     {
         gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
@@ -440,11 +435,11 @@ gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
 {
     if (g_isIdle)
         wxapp_install_idle_handler();
-        
+
     GList *child = win->m_list->children;
     for (child = win->m_list->children; child != NULL; child = child->next)
         gtk_widget_show( GTK_WIDGET(child->data) );
-    
+
     return false;
 }
 }
@@ -541,7 +536,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_signal_connect( GTK_OBJECT(m_list), "realize",
                         GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this );
-                            
+
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
@@ -735,7 +730,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_show( list_item );
-        
+
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
@@ -750,8 +745,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );
-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
+        gtk_widget_modify_style( GTK_WIDGET( bin->child ), style );
         gtk_rc_style_unref( style );
     }
 }
@@ -893,16 +887,12 @@ wxString wxListBox::GetRealLabel(GList *item) const
 
     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
+    // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h
     if ( m_hasCheckBoxes )
         str.erase(0, 4);
 #endif // wxUSE_CHECKLISTBOX
@@ -937,7 +927,7 @@ void wxListBox::SetString( int n, const wxString &string )
 
 wxString wxListBox::GetString( int n ) const
 {
-    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxEmptyString, wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
@@ -947,7 +937,7 @@ wxString wxListBox::GetString( int n ) const
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 
-    return wxT("");
+    return wxEmptyString;
 }
 
 int wxListBox::GetCount() const
@@ -958,15 +948,15 @@ int wxListBox::GetCount() const
     return g_list_length(children);
 }
 
-int wxListBox::FindString( const wxString &item ) const
+int wxListBox::FindString( const wxString &item, bool bCase ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
     while (child)
     {
-        if ( GetRealLabel(child) == item )
+        if ( item.IsSameAs( GetRealLabel(child), bCase ) )
             return count;
 
         count++;
@@ -1136,7 +1126,7 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
     return TRUE;
 
-#if 0    
+#if 0
     if (m_widget->window == window) return TRUE;
 
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
@@ -1247,7 +1237,7 @@ wxSize wxListBox::DoGetBestSize() const
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);
-    CacheBestSize(best);        
+    CacheBestSize(best);
     return best;
 }
 
@@ -1268,4 +1258,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_LISTBOX
-