X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a16063d3c25a933e2ded1c3b906d082142686f..910484a67ddd6eac7c2ec947fc9e2e71f95abb6e:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 406b583e7c..4c496c67a0 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -12,8 +12,11 @@ #pragma implementation "listbox.h" #endif -#include "wx/dynarray.h" #include "wx/listbox.h" + +#if wxUSE_LISTBOX + +#include "wx/dynarray.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/checklst.h" @@ -42,13 +45,15 @@ extern bool g_isIdle; //------------------------------------------------------------------------- #if (GTK_MINOR_VERSION > 0) -#define NEW_GTK_SCROLL_CODE + #define NEW_GTK_SCROLL_CODE #endif //----------------------------------------------------------------------------- // private functions //----------------------------------------------------------------------------- +#if wxUSE_CHECKLISTBOX + #define CHECKBOX_STRING "[-] " // checklistboxes have "[±] " prepended to their lables, this macro removes it @@ -57,6 +62,12 @@ extern bool g_isIdle; // 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 //----------------------------------------------------------------------------- @@ -64,36 +75,30 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; +static bool g_hasDoubleClicked = FALSE; + //----------------------------------------------------------------------------- -// "button_press_event" +// "button_release_event" //----------------------------------------------------------------------------- +/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once + a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the + listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event. + this can lead to race conditions so that we emit the dclick event + after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */ + static gint -gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) { if (g_isIdle) wxapp_install_idle_handler(); if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnScroll) return FALSE; - if (!listbox->HasVMT()) return FALSE; - - int sel = listbox->GetIndex( widget ); - - if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) - { - wxCheckListBox *clb = (wxCheckListBox *)listbox; - - clb->Check( sel, !clb->IsChecked(sel) ); + if (!listbox->m_hasVMT) return FALSE; - wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); - event.SetEventObject( listbox ); - event.SetInt( sel ); - listbox->GetEventHandler()->ProcessEvent( event ); - } + if (!g_hasDoubleClicked) return FALSE; - if (gdk_event->type == GDK_2BUTTON_PRESS) - { wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() ); event.SetEventObject( listbox ); @@ -114,7 +119,41 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, listbox->GetEventHandler()->ProcessEvent( event ); + return FALSE; +} + +//----------------------------------------------------------------------------- +// "button_press_event" +//----------------------------------------------------------------------------- + +static gint +gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox ) +{ + if (g_isIdle) wxapp_install_idle_handler(); + + if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnScroll) return FALSE; + + if (!listbox->m_hasVMT) return FALSE; + + int sel = listbox->GetIndex( widget ); + +#if wxUSE_CHECKLISTBOX + if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS)) + { + wxCheckListBox *clb = (wxCheckListBox *)listbox; + + clb->Check( sel, !clb->IsChecked(sel) ); + + wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() ); + event.SetEventObject( listbox ); + event.SetInt( sel ); + listbox->GetEventHandler()->ProcessEvent( event ); } +#endif // wxUSE_CHECKLISTBOX + + /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */ + g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS); return FALSE; } @@ -123,6 +162,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, // "key_press_event" //----------------------------------------------------------------------------- +#if wxUSE_CHECKLISTBOX static gint gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox ) { @@ -130,7 +170,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis if (g_blockEventsOnDrag) return FALSE; - if (!listbox->HasVMT()) return FALSE; + if (!listbox->m_hasVMT) return FALSE; if (gdk_event->keyval != ' ') return FALSE; @@ -147,6 +187,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis return FALSE; } +#endif // wxUSE_CHECKLISTBOX //----------------------------------------------------------------------------- // "select" and "deselect" @@ -156,7 +197,7 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox { if (g_isIdle) wxapp_install_idle_handler(); - if (!listbox->HasVMT()) return; + if (!listbox->m_hasVMT) return; if (g_blockEventsOnDrag) return; wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); @@ -190,7 +231,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl) wxListBox::wxListBox() { m_list = (GtkList *) NULL; +#if wxUSE_CHECKLISTBOX m_hasCheckBoxes = FALSE; +#endif // wxUSE_CHECKLISTBOX } bool wxListBox::Create( wxWindow *parent, wxWindowID id, @@ -203,7 +246,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, PreCreation( parent, id, pos, size, style, name ); +#if wxUSE_VALIDATORS SetValidator( validator ); +#endif m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL ); if (style & wxLB_ALWAYS_SB) @@ -248,10 +293,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, GtkWidget *list_item; wxString str(choices[i]); +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { str.Prepend(CHECKBOX_STRING); } +#endif // wxUSE_CHECKLISTBOX list_item = gtk_list_item_new_with_label( str.mbc_str() ); @@ -269,6 +316,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, (GtkSignalFunc)gtk_listbox_button_press_callback, (gpointer) this ); + gtk_signal_connect_after( GTK_OBJECT(list_item), + "button_release_event", + (GtkSignalFunc)gtk_listbox_button_release_callback, + (gpointer) this ); + +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { gtk_signal_connect( GTK_OBJECT(list_item), @@ -276,15 +329,14 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, (GtkSignalFunc)gtk_listbox_key_press_callback, (gpointer)this ); } +#endif // wxUSE_CHECKLISTBOX ConnectWidget( list_item ); gtk_widget_show( list_item ); } - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); @@ -340,7 +392,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str(GET_REAL_LABEL(label->label)); + wxString str(GET_REAL_LABEL(label->label),*wxConvCurrent); deletedLabels.Add(str); // save data @@ -370,11 +422,13 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) deletedData.Add(clientData); +#if wxUSE_CHECKLISTBOX // save check state if ( m_hasCheckBoxes ) { deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n)); } +#endif // wxUSE_CHECKLISTBOX } int nDeletedCount = n; @@ -393,10 +447,12 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos) { Append(deletedLabels[n], deletedData[n]); +#if wxUSE_CHECKLISTBOX if ( m_hasCheckBoxes ) { ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]); } +#endif // wxUSE_CHECKLISTBOX } } @@ -407,10 +463,12 @@ void wxListBox::AppendCommon( const wxString &item ) GtkWidget *list_item; wxString label(item); +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { label.Prepend(CHECKBOX_STRING); } +#endif // wxUSE_CHECKLISTBOX list_item = gtk_list_item_new_with_label( label.mbc_str() ); @@ -419,7 +477,7 @@ void wxListBox::AppendCommon( const wxString &item ) gtk_signal_connect( GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); - if (GetWindowStyleFlag() & wxLB_MULTIPLE) + if (HasFlag(wxLB_MULTIPLE)) gtk_signal_connect( GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this ); @@ -428,6 +486,12 @@ void wxListBox::AppendCommon( const wxString &item ) (GtkSignalFunc)gtk_listbox_button_press_callback, (gpointer) this ); + gtk_signal_connect_after( GTK_OBJECT(list_item), + "button_release_event", + (GtkSignalFunc)gtk_listbox_button_release_callback, + (gpointer) this ); + +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) { gtk_signal_connect( GTK_OBJECT(list_item), @@ -435,6 +499,7 @@ void wxListBox::AppendCommon( const wxString &item ) (GtkSignalFunc)gtk_listbox_key_press_callback, (gpointer)this ); } +#endif // wxUSE_CHECKLISTBOX gtk_widget_show( list_item ); @@ -454,7 +519,7 @@ void wxListBox::AppendCommon( const wxString &item ) #endif #if wxUSE_TOOLTIPS - if (m_toolTip) m_toolTip->Apply( this ); + if (m_tooltip) m_tooltip->Apply( this ); #endif } } @@ -589,7 +654,7 @@ int wxListBox::FindString( const wxString &item ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = GET_REAL_LABEL(label->label); + wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); if (str == item) return count; @@ -658,7 +723,7 @@ wxString wxListBox::GetString( int n ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = GET_REAL_LABEL(label->label); + wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); return str; } @@ -678,7 +743,7 @@ wxString wxListBox::GetStringSelection() const GtkBin *bin = GTK_BIN( selection->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = GET_REAL_LABEL(label->label); + wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent); return str; } @@ -751,8 +816,10 @@ void wxListBox::SetString( int n, const wxString &string ) GtkLabel *label = GTK_LABEL( bin->child ); wxString str; +#if wxUSE_CHECKLISTBOX if (m_hasCheckBoxes) str += CHECKBOX_STRING; +#endif // wxUSE_CHECKLISTBOX str += string; gtk_label_set( label, str.mbc_str() ); @@ -792,7 +859,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) GList *child = m_list->children; while (child) { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConv_local.cWX2MB(tip), (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvLocal.cWX2MB(tip), (gchar*) NULL ); child = child->next; } } @@ -858,9 +925,12 @@ void wxListBox::ApplyWidgetStyle() if (m_backgroundColour.Ok()) { GdkWindow *window = GTK_WIDGET(m_list)->window; - m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); - gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); + if ( window ) + { + m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); + gdk_window_set_background( window, m_backgroundColour.GetColor() ); + gdk_window_clear( window ); + } } GList *child = m_list->children; @@ -875,3 +945,5 @@ void wxListBox::ApplyWidgetStyle() child = child->next; } } + +#endif \ No newline at end of file