X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da7b3583d88236a8601bda8f2eb418f49b569fa7..b908d2244a4975ceda4e050744280bf07e9ff350:/src/gtk1/listbox.cpp diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp index 6e98cf6ca5..4c496c67a0 100644 --- a/src/gtk1/listbox.cpp +++ b/src/gtk1/listbox.cpp @@ -12,11 +12,15 @@ #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" +#include "wx/settings.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -29,20 +33,27 @@ #include "gdk/gdk.h" #include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //------------------------------------------------------------------------- // conditional compilation //------------------------------------------------------------------------- -#if (GTK_MINOR_VERSION == 1) - #if (GTK_MICRO_VERSION >= 5) - #define NEW_GTK_SCROLL_CODE - #endif +#if (GTK_MINOR_VERSION > 0) + #define NEW_GTK_SCROLL_CODE #endif //----------------------------------------------------------------------------- // private functions //----------------------------------------------------------------------------- +#if wxUSE_CHECKLISTBOX + #define CHECKBOX_STRING "[-] " // checklistboxes have "[±] " prepended to their lables, this macro removes it @@ -51,6 +62,12 @@ // 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 //----------------------------------------------------------------------------- @@ -58,34 +75,30 @@ 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 ); @@ -106,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; } @@ -115,12 +162,15 @@ 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 ) { + if (g_isIdle) wxapp_install_idle_handler(); + if (g_blockEventsOnDrag) return FALSE; - if (!listbox->HasVMT()) return FALSE; + if (!listbox->m_hasVMT) return FALSE; if (gdk_event->keyval != ' ') return FALSE; @@ -137,6 +187,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis return FALSE; } +#endif // wxUSE_CHECKLISTBOX //----------------------------------------------------------------------------- // "select" and "deselect" @@ -144,7 +195,9 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox ) { - if (!listbox->HasVMT()) return; + if (g_isIdle) wxapp_install_idle_handler(); + + if (!listbox->m_hasVMT) return; if (g_blockEventsOnDrag) return; wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() ); @@ -178,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, @@ -191,11 +246,21 @@ 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 ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + if (style & wxLB_ALWAYS_SB) + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS ); + } + else + { + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); + } m_list = GTK_LIST( gtk_list_new() ); @@ -213,25 +278,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id, gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) ); #endif -#ifdef __WXDEBUG__ - debug_focus_in( m_widget, "wxListBox::m_widget", name ); - - debug_focus_in( GTK_WIDGET(m_list), "wxListBox::m_list", name ); - - GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget); - - debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name ); - debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name ); - -#ifdef NEW_GTK_SCROLL_CODE - GtkViewport *viewport = GTK_VIEWPORT(s_window->child); -#else - GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport); -#endif - - debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name ); -#endif - gtk_widget_show( GTK_WIDGET(m_list) ); wxSize newSize = size; @@ -247,16 +293,14 @@ 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 ); - -#ifdef __WXDEBUG__ - debug_focus_in( list_item, "wxListBox::list_item", name ); -#endif + list_item = gtk_list_item_new_with_label( str.mbc_str() ); gtk_container_add( GTK_CONTAINER(m_list), list_item ); @@ -272,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), @@ -279,21 +329,18 @@ 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(); - gtk_widget_realize( GTK_WIDGET(m_list) ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); @@ -309,11 +356,11 @@ wxListBox::~wxListBox() void wxListBox::InsertItems(int nItems, const wxString items[], int pos) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GList *children = m_list->children; int length = g_list_length(children); - wxCHECK_RET( pos <= length, "invalid index in wxListBox::InsertItems" ); + wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") ); // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item // into a listbox at the given position, this is why we first delete @@ -345,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 @@ -375,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; @@ -398,43 +447,51 @@ 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 } } void wxListBox::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); 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 ); + list_item = gtk_list_item_new_with_label( label.mbc_str() ); gtk_container_add( GTK_CONTAINER(m_list), list_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 ); - if (m_widgetStyle) ApplyWidgetStyle(); - gtk_signal_connect( GTK_OBJECT(list_item), "button_press_event", (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), @@ -442,20 +499,29 @@ void wxListBox::AppendCommon( const wxString &item ) (GtkSignalFunc)gtk_listbox_key_press_callback, (gpointer)this ); } +#endif // wxUSE_CHECKLISTBOX gtk_widget_show( list_item ); ConnectWidget( list_item ); + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_realize( list_item ); + gtk_widget_realize( GTK_BIN(list_item)->child ); + + if (m_widgetStyle) ApplyWidgetStyle(); + #if wxUSE_DRAG_AND_DROP #ifndef NEW_GTK_DND_CODE - if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); + if (m_dropTarget) m_dropTarget->RegisterWidget( list_item ); #endif #endif #if wxUSE_TOOLTIPS - if (m_toolTip) m_toolTip->Apply( this ); + if (m_tooltip) m_tooltip->Apply( this ); #endif + } } void wxListBox::Append( const wxString &item ) @@ -484,7 +550,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData ) void wxListBox::SetClientData( int n, void* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return; @@ -494,7 +560,7 @@ void wxListBox::SetClientData( int n, void* clientData ) void* wxListBox::GetClientData( int n ) { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); + wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") ); wxNode *node = m_clientDataList.Nth( n ); if (!node) return NULL; @@ -504,7 +570,7 @@ void* wxListBox::GetClientData( int n ) void wxListBox::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); + wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; @@ -517,7 +583,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData ) wxClientData* wxListBox::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") ); wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; @@ -527,7 +593,7 @@ wxClientData* wxListBox::GetClientObject( int n ) void wxListBox::Clear() { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); gtk_list_clear_items( m_list, 0, Number() ); @@ -545,11 +611,11 @@ void wxListBox::Clear() void wxListBox::Delete( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); - wxCHECK_RET( child, "wrong listbox index" ); + wxCHECK_RET( child, _T("wrong listbox index") ); GList *list = g_list_append( (GList*) NULL, child->data ); gtk_list_remove_items( m_list, list ); @@ -572,14 +638,14 @@ void wxListBox::Delete( int n ) void wxListBox::Deselect( int n ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); gtk_list_unselect_item( m_list, n ); } int wxListBox::FindString( const wxString &item ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -588,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; @@ -604,7 +670,7 @@ int wxListBox::FindString( const wxString &item ) const int wxListBox::GetSelection() const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -619,7 +685,7 @@ int wxListBox::GetSelection() const int wxListBox::GetSelections( wxArrayInt& aSelections ) const { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); // get the number of selected items first GList *child = m_list->children; @@ -649,7 +715,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const wxString wxListBox::GetString( int n ) const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -657,19 +723,19 @@ 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; } - wxFAIL_MSG("wrong listbox index"); + wxFAIL_MSG(_T("wrong listbox index")); - return ""; + return _T(""); } wxString wxListBox::GetStringSelection() const { - wxCHECK_MSG( m_list != NULL, "", "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") ); GList *selection = m_list->selection; if (selection) @@ -677,18 +743,18 @@ 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; } - wxFAIL_MSG("no listbox selection available"); - return ""; + wxFAIL_MSG(_T("no listbox selection available")); + return _T(""); } int wxListBox::Number() { - wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") ); GList *child = m_list->children; int count = 0; @@ -698,7 +764,7 @@ int wxListBox::Number() bool wxListBox::Selected( int n ) { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" ); + wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") ); GList *target = g_list_nth( m_list->children, n ); if (target) @@ -710,28 +776,28 @@ bool wxListBox::Selected( int n ) child = child->next; } } - wxFAIL_MSG("wrong listbox index"); + wxFAIL_MSG(_T("wrong listbox index")); return FALSE; } void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) ) { - wxFAIL_MSG("wxListBox::Set not implemented"); + wxFAIL_MSG(_T("wxListBox::Set not implemented")); } void wxListBox::SetFirstItem( int WXUNUSED(n) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) ) { - wxFAIL_MSG("wxListBox::SetFirstItem not implemented"); + wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented")); } void wxListBox::SetSelection( int n, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); if (select) gtk_list_select_item( m_list, n ); @@ -741,7 +807,7 @@ void wxListBox::SetSelection( int n, bool select ) void wxListBox::SetString( int n, const wxString &string ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); GList *child = g_list_nth( m_list->children, n ); if (child) @@ -750,21 +816,23 @@ 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 ); + gtk_label_set( label, str.mbc_str() ); } else { - wxFAIL_MSG("wrong listbox index"); + wxFAIL_MSG(_T("wrong listbox index")); } } void wxListBox::SetStringSelection( const wxString &string, bool select ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); SetSelection( FindString(string), select ); } @@ -786,12 +854,12 @@ int wxListBox::GetIndex( GtkWidget *item ) const } #if wxUSE_TOOLTIPS -void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip ) +void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { GList *child = m_list->children; while (child) { - gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), tip, (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvLocal.cWX2MB(tip), (gchar*) NULL ); child = child->next; } } @@ -800,7 +868,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const char *tip ) #if wxUSE_DRAG_AND_DROP void wxListBox::SetDropTarget( wxDropTarget *dropTarget ) { - wxCHECK_RET( m_list != NULL, "invalid listbox" ); + wxCHECK_RET( m_list != NULL, _T("invalid listbox") ); #ifndef NEW_GTK_DND_CODE if (m_dropTarget) @@ -857,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 +946,4 @@ void wxListBox::ApplyWidgetStyle() } } +#endif \ No newline at end of file