// Name: src/gtk1/listbox.cpp
// Purpose:
// Author: Robert Roebling
-// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
- GdkEvent *WXUNUSED(event),
- wxWindow *win )
+static gint gtk_listitem_focus_in_callback( GtkWidget *WXUNUSED(widget),
+ GdkEvent *WXUNUSED(event),
+ wxWindow *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
win->m_hasFocus = true;
wxChildFocusEvent eventChildFocus(win);
- (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
+ (void)win->HandleWindowEvent(eventChildFocus);
wxFocusEvent eventFocus(wxEVT_SET_FOCUS, win->GetId());
eventFocus.SetEventObject(win);
- (void)win->GetEventHandler()->ProcessEvent(eventFocus);
+ (void)win->HandleWindowEvent(eventFocus);
}
return FALSE;
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
+static gint gtk_listitem_focus_out_callback( GtkWidget *WXUNUSED(widget),
+ GdkEventFocus *WXUNUSED(gdk_event),
+ wxWindowGTK *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
- g_focusWindow = (wxWindowGTK *)NULL;
+ g_focusWindow = NULL;
// don't send the window a kill focus event if it thinks that it doesn't
// have focus already
// process it too as otherwise bad things happen, especially in GTK2
// where the text control simply aborts the program if it doesn't get
// the matching focus out event
- (void)win->GetEventHandler()->ProcessEvent( event );
+ (void)win->HandleWindowEvent( event );
}
return FALSE;
// "button_release_event"
//-----------------------------------------------------------------------------
-/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
+/* we would normally emit a wxEVT_LISTBOX_DCLICK 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
if (!g_hasDoubleClicked) return FALSE;
- wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+ wxCommandEvent event( wxEVT_LISTBOX_DCLICK, listbox->GetId() );
event.SetEventObject( listbox );
wxArrayInt aSelections;
event.SetInt(n);
- listbox->GetEventHandler()->ProcessEvent( event );
+ listbox->HandleWindowEvent( event );
return FALSE;
}
clb->Check( sel, !clb->IsChecked(sel) );
- wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+ wxCommandEvent event( wxEVT_CHECKLISTBOX, listbox->GetId() );
event.SetEventObject( listbox );
event.SetInt( sel );
- listbox->GetEventHandler()->ProcessEvent( event );
+ listbox->HandleWindowEvent( event );
}
#endif // wxUSE_CHECKLISTBOX
return false;
}
- /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
+ /* emit wxEVT_LISTBOX_DCLICK later */
g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
return FALSE;
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
new_event.SetCurrentFocus( listbox );
- ret = listbox->GetEventHandler()->ProcessEvent( new_event );
+ ret = listbox->HandleWindowEvent( new_event );
}
if ((gdk_event->keyval == GDK_Return) && (!ret))
clb->Check( sel, !clb->IsChecked(sel) );
- wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+ wxCommandEvent new_event( wxEVT_CHECKLISTBOX, listbox->GetId() );
new_event.SetEventObject( listbox );
new_event.SetInt( sel );
- ret = listbox->GetEventHandler()->ProcessEvent( new_event );
+ ret = listbox->HandleWindowEvent( new_event );
}
#endif // wxUSE_CHECKLISTBOX
else
gtk_list_select_item( listbox->m_list, sel );
- wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ wxCommandEvent new_event(wxEVT_LISTBOX, listbox->GetId() );
new_event.SetEventObject( listbox );
wxArrayInt aSelections;
int n, count = listbox->GetSelections(aSelections);
n = -1;
}
new_event.SetInt(n);
- listbox->GetEventHandler()->ProcessEvent( new_event );
+ listbox->HandleWindowEvent( new_event );
}
}
if (listbox->m_blockEvent) return;
- wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+ wxCommandEvent event(wxEVT_LISTBOX, listbox->GetId() );
event.SetEventObject( listbox );
// indicate whether this is a selection or a deselection
// No longer required with new code in wxLB_SINGLE
// listbox->GetEventHandler()->AddPendingEvent( event );
- listbox->GetEventHandler()->ProcessEvent( event );
+ listbox->HandleWindowEvent( event );
}
extern "C" {
extern "C" {
static gint
-gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
+gtk_listbox_realized_callback( GtkWidget *WXUNUSED(widget), wxListBox *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
// wxListBox
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
-
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
wxListBox::wxListBox()
{
- m_list = (GtkList *) NULL;
+ m_list = NULL;
#if wxUSE_CHECKLISTBOX
m_hasCheckBoxes = false;
#endif // wxUSE_CHECKLISTBOX
return false;
}
- m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
+ m_widget = gtk_scrolled_window_new( NULL, NULL );
if (style & wxLB_ALWAYS_SB)
{
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
}
else
{
- m_strings = (wxSortedArrayString *)NULL;
+ m_strings = NULL;
}
Append(n, choices);
Clear();
- if (m_strings)
- delete m_strings;
+ delete m_strings;
}
// ----------------------------------------------------------------------------
const unsigned idx = m_strings ? m_strings->Add(item)
: pos;
- GtkAddItem(item, idx == GetCount() ? -1 : idx);
+ GtkAddItem(item, idx == GetCount() ? (unsigned) -1 : idx);
m_clientList.Insert(idx, NULL);
wxCHECK_RET( child, wxT("wrong listbox index") );
- GList *list = g_list_append( (GList*) NULL, child->data );
+ GList *list = g_list_append( NULL, child->data );
gtk_list_remove_items( m_list, list );
g_list_free( list );
str = wxString( label->label );
#if wxUSE_CHECKLISTBOX
- // checklistboxes have "[±] " prepended to their lables, remove it
+ // checklistboxes have "[±] " prepended to their lables, remove it
//
// NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h
if ( m_hasCheckBoxes )
GList *child = m_list->children;
while (child)
{
- gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+ gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), NULL );
child = child->next;
}
}
bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{
- return true;
-
-#if 0
- if (m_widget->window == window) return true;
-
- if (GTK_WIDGET(m_list)->window == window) return true;
-
- GList *child = m_list->children;
- while (child)
- {
- GtkWidget *bin = GTK_WIDGET( child->data );
- if (bin->window == window) return true;
- child = child->next;
- }
-
- return false;
-#endif
+ return m_widget->window == window ||
+ GTK_WIDGET(m_list)->window == window;
}
void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
- if (m_hasBgCol && m_backgroundColour.Ok())
+ if (m_hasBgCol && m_backgroundColour.IsOk())
{
GdkWindow *window = GTK_WIDGET(m_list)->window;
if ( window )
void wxListBox::OnInternalIdle()
{
wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
+ if (g_globalCursor.IsOk()) cursor = g_globalCursor;
- if (GTK_WIDGET(m_list)->window && cursor.Ok())
+ if (GTK_WIDGET(m_list)->window && cursor.IsOk())
{
/* I now set the cursor the anew in every OnInternalIdle call
as setting the cursor in a parent window also effects the
projects / wxWidgets.git / blobdiff