#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"
//-------------------------------------------------------------------------
#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
// 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
//-----------------------------------------------------------------------------
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 );
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;
}
// "key_press_event"
//-----------------------------------------------------------------------------
+#if wxUSE_CHECKLISTBOX
static gint
gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
{
if (g_blockEventsOnDrag) return FALSE;
- if (!listbox->HasVMT()) return FALSE;
+ if (!listbox->m_hasVMT) return FALSE;
if (gdk_event->keyval != ' ') return FALSE;
return FALSE;
}
+#endif // wxUSE_CHECKLISTBOX
//-----------------------------------------------------------------------------
// "select" and "deselect"
{
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() );
wxListBox::wxListBox()
{
m_list = (GtkList *) NULL;
+#if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
}
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)
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() );
(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),
(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();
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
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;
{
Append(deletedLabels[n], deletedData[n]);
+#if wxUSE_CHECKLISTBOX
if ( m_hasCheckBoxes )
{
((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
}
+#endif // wxUSE_CHECKLISTBOX
}
}
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() );
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 );
(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),
(GtkSignalFunc)gtk_listbox_key_press_callback,
(gpointer)this );
}
+#endif // wxUSE_CHECKLISTBOX
gtk_widget_show( list_item );
#endif
#if wxUSE_TOOLTIPS
- if (m_toolTip) m_toolTip->Apply( this );
+ if (m_tooltip) m_tooltip->Apply( this );
#endif
}
}
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;
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;
}
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;
}
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() );
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;
}
}
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;
child = child->next;
}
}
+
+#endif
\ No newline at end of file
projects / wxWidgets.git / blobdiff