X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7ac4461ab64212a536a8dabffc2ad65ef573a5f..e1ee679c2e3f48bc4f2607e35033ed5505ed6665:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index 9bf71e04f5..81d2380a01 100644 --- a/src/gtk1/choice.cpp +++ b/src/gtk1/choice.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,9 +14,18 @@ #include "wx/choice.h" +#if wxUSE_CHOICE + #include "gdk/gdk.h" #include "gtk/gtk.h" +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -29,15 +38,18 @@ extern bool g_blockEventsOnDrag; static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { - if (!choice->HasVMT()) return; - if (g_blockEventsOnDrag) return; - - wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); - event.SetInt( choice->GetSelection() ); - wxString tmp( choice->GetStringSelection() ); - event.SetString( WXSTRINGCAST(tmp) ); - event.SetEventObject(choice); - choice->GetEventHandler()->ProcessEvent(event); + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!choice->m_hasVMT) return; + + if (g_blockEventsOnDrag) return; + + wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() ); + event.SetInt( choice->GetSelection() ); + event.SetString( choice->GetStringSelection() ); + event.SetEventObject(choice); + choice->GetEventHandler()->ProcessEvent(event); } //----------------------------------------------------------------------------- @@ -56,177 +68,165 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - - SetValidator( validator ); +#if (GTK_MINOR_VERSION > 0) + m_acceptsFocus = TRUE; +#endif + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxChoice creation failed") ); + return FALSE; + } m_widget = gtk_option_menu_new(); - - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 80; - if (newSize.y == -1) newSize.y = 26; + + wxSize newSize(size); + if (newSize.x == -1) + newSize.x = 80; + if (newSize.y == -1) + newSize.y = 26; SetSize( newSize.x, newSize.y ); - + GtkWidget *menu = gtk_menu_new(); - + for (int i = 0; i < n; i++) { - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - GtkWidget *item = gtk_menu_item_new_with_label( choices[i] ); + m_clientList.Append( (wxObject*) NULL ); + + GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() ); gtk_menu_append( GTK_MENU(menu), item ); - - gtk_widget_realize( item ); - gtk_widget_realize( GTK_BIN(item)->child ); - + gtk_widget_show( item ); - - gtk_signal_connect( GTK_OBJECT( item ), "activate", + + gtk_signal_connect( GTK_OBJECT( item ), "activate", GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); } gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - - m_parent->AddChild( this ); - (m_parent->m_insertCallback)( m_parent, this ); - + m_parent->DoAddChild( this ); + PostCreation(); - + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); SetFont( parent->GetFont() ); Show( TRUE ); - + return TRUE; } - + wxChoice::~wxChoice() { Clear(); } -void wxChoice::AppendCommon( const wxString &item ) +int wxChoice::DoAppend( const wxString &item ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); - + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); + GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ); - GtkWidget *menu_item = gtk_menu_item_new_with_label( item ); - + GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() ); + gtk_menu_append( GTK_MENU(menu), menu_item ); - - gtk_widget_realize( menu_item ); - gtk_widget_realize( GTK_BIN(menu_item)->child ); - - if (m_widgetStyle) ApplyWidgetStyle(); - - gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", + + if (GTK_WIDGET_REALIZED(m_widget)) + { + gtk_widget_realize( menu_item ); + gtk_widget_realize( GTK_BIN(menu_item)->child ); + + if (m_widgetStyle) ApplyWidgetStyle(); + } + + gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - + gtk_widget_show( menu_item ); -} -void wxChoice::Append( const wxString &item ) -{ - m_clientDataList.Append( (wxObject*) NULL ); - m_clientObjectList.Append( (wxObject*) NULL ); - - AppendCommon( item ); -} + m_clientList.Append( (wxObject*) NULL ); -void wxChoice::Append( const wxString &item, void *clientData ) -{ - m_clientDataList.Append( (wxObject*) clientData ); - m_clientObjectList.Append( (wxObject*) NULL ); - - AppendCommon( item ); + // return the index of the item in the control + return GetCount() - 1; } -void wxChoice::Append( const wxString &item, wxClientData *clientData ) +void wxChoice::DoSetClientData( int n, void* clientData ) { - m_clientObjectList.Append( (wxObject*) clientData ); - m_clientDataList.Append( (wxObject*) NULL ); - - AppendCommon( item ); -} + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientData") ); -void wxChoice::SetClientData( int n, void* clientData ) -{ - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return; - node->SetData( (wxObject*) clientData ); } -void* wxChoice::GetClientData( int n ) +void* wxChoice::DoGetClientData( int n ) const { - wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); - if (!node) return NULL; - + wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetClientData") ); + return node->Data(); } -void wxChoice::SetClientObject( int n, wxClientData* clientData ) +void wxChoice::DoSetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return; - + wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientObject") ); + wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; - + delete cd; + node->SetData( (wxObject*) clientData ); } -wxClientData* wxChoice::GetClientObject( int n ) +wxClientData* wxChoice::DoGetClientObject( int n ) const { - wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, "invalid combobox" ); - - wxNode *node = m_clientObjectList.Nth( n ); - if (!node) return (wxClientData*) NULL; - + wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid combobox") ); + + wxNode *node = m_clientList.Nth( n ); + wxCHECK_MSG( node, (wxClientData *)NULL, + wxT("invalid index in wxChoice::DoGetClientObject") ); + return (wxClientData*) node->Data(); } - + void wxChoice::Clear() { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) ); GtkWidget *menu = gtk_menu_new(); gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu ); - - wxNode *node = m_clientObjectList.First(); - while (node) + + if (m_clientDataItemsType == ClientData_Object) { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); + wxNode *node = m_clientList.First(); + while (node) + { + wxClientData *cd = (wxClientData*)node->Data(); + if (cd) delete cd; + node = node->Next(); + } } - m_clientObjectList.Clear(); - - m_clientDataList.Clear(); + m_clientList.Clear(); } void wxChoice::Delete( int WXUNUSED(n) ) { - wxFAIL_MSG( "wxChoice:Delete not implemented" ); + wxFAIL_MSG( wxT("wxChoice:Delete not implemented") ); } int wxChoice::FindString( const wxString &string ) const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); // If you read this code once and you think you understand // it, then you are very wrong. Robert Roebling. - + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; GList *child = menu_shell->children; @@ -236,27 +236,22 @@ int wxChoice::FindString( const wxString &string ) const GtkLabel *label = (GtkLabel *) NULL; if (bin->child) label = GTK_LABEL(bin->child); if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); - - wxASSERT_MSG( label != NULL , "wxChoice: invalid label" ); - - if (string == label->label) return count; + + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + + if (string == wxString(label->label,*wxConvCurrent)) + return count; + child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: string not found" ); - - return -1; -} -int wxChoice::GetColumns() const -{ - return 1; + return -1; } -int wxChoice::GetSelection() +int wxChoice::GetSelection() const { - wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -268,15 +263,13 @@ int wxChoice::GetSelection() child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: no selection" ); - + return -1; } wxString wxChoice::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -289,34 +282,23 @@ wxString wxChoice::GetString( int n ) const GtkLabel *label = (GtkLabel *) NULL; if (bin->child) label = GTK_LABEL(bin->child); if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); - - wxASSERT_MSG( label != NULL , "wxChoice: invalid label" ); - - return label->label; + + wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") ); + + return wxString(label->label,*wxConvCurrent); } child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: string not found" ); - - return ""; -} -wxString wxChoice::GetStringSelection() const -{ - wxCHECK_MSG( m_widget != NULL, "", "invalid choice" ); + wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") ); - GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); - - wxASSERT_MSG( label != NULL , "wxChoice: invalid label" ); - - return label->label; + return wxT(""); } -int wxChoice::Number() const +int wxChoice::GetCount() const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -329,50 +311,67 @@ int wxChoice::Number() const return count; } -void wxChoice::SetColumns( int WXUNUSED(n) ) -{ -} - void wxChoice::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid choice") ); int tmp = n; gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp ); - - gtk_choice_clicked_callback( (GtkWidget *) NULL, this ); } -void wxChoice::SetStringSelection( const wxString &string ) +void wxChoice::DisableEvents() +{ +/* + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + GList *child = menu_shell->children; + while (child) + { + gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ), + GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); + + child = child->next; + } +*/ +} + +void wxChoice::EnableEvents() { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); +/* + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); + GList *child = menu_shell->children; + while (child) + { + gtk_signal_connect( GTK_OBJECT( child->data ), "activate", + GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); - int n = FindString( string ); - if (n != -1) SetSelection( n ); + child = child->next; + } +*/ } void wxChoice::ApplyWidgetStyle() { SetWidgetStyle(); - + GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); - + gtk_widget_set_style( m_widget, m_widgetStyle ); gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle ); - + GList *child = menu_shell->children; while (child) { gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle ); - + GtkBin *bin = GTK_BIN( child->data ); GtkWidget *label = (GtkWidget *) NULL; if (bin->child) label = bin->child; if (!label) label = GTK_BUTTON(m_widget)->child; - + gtk_widget_set_style( label, m_widgetStyle ); - + child = child->next; } } +#endif