X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..1e133b7d6438b9144b8f68cf6b514d03eaaf698b:/src/gtk1/choice.cpp diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp index e0f1da1d40..ba049f6447 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,6 +14,9 @@ #include "wx/choice.h" +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -26,13 +29,15 @@ extern bool g_blockEventsOnDrag; static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { - if (!choice->HasVMT()) return; - if (g_blockEventsOnDrag) return; - + 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.SetString( choice->GetStringSelection() ); event.SetEventObject(choice); choice->GetEventHandler()->ProcessEvent(event); } @@ -53,191 +58,182 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; - +#if (GTK_MINOR_VERSION > 0) + m_acceptsFocus = TRUE; +#endif + PreCreation( parent, id, pos, size, style, name ); - + SetValidator( validator ); 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 ); - - GtkWidget *item = gtk_menu_item_new_with_label( choices[i] ); + m_clientObjectList.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 ); - + PostCreation(); - + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); Show( TRUE ); - + return TRUE; } - + wxChoice::~wxChoice() { - wxNode *node = m_clientDataList.First(); - while (node) - { - wxClientData *cd = (wxClientData*)node->Data(); - if (cd) delete cd; - node = node->Next(); - } - m_clientDataList.Clear(); + Clear(); } void wxChoice::AppendCommon( const wxString &item ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); - + wxCHECK_RET( m_widget != NULL, _T("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_clientDataList.Append( (wxObject*) NULL ); + m_clientObjectList.Append( (wxObject*) NULL ); + AppendCommon( item ); } void wxChoice::Append( const wxString &item, void *clientData ) { - if (clientData) - m_clientDataList.Append( (wxObject*) new wxVoidClientData( clientData ) ); - else - m_clientDataList.Append( (wxObject*)NULL ); - + m_clientDataList.Append( (wxObject*) clientData ); + m_clientObjectList.Append( (wxObject*) NULL ); + AppendCommon( item ); } void wxChoice::Append( const wxString &item, wxClientData *clientData ) { - m_clientDataList.Append( (wxObject*) clientData ); - + m_clientObjectList.Append( (wxObject*) clientData ); + m_clientDataList.Append( (wxObject*) NULL ); + AppendCommon( item ); } void wxChoice::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; - - wxClientData *cd = (wxClientData*) node->Data(); - if (cd) delete cd; - - if (clientData) - node->SetData( (wxObject*) new wxVoidClientData(clientData) ); - else - node->SetData( (wxObject*) NULL ); + + node->SetData( (wxObject*) clientData ); } void* wxChoice::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; - - wxVoidClientData *cd = (wxVoidClientData*) node->Data(); - if (cd) - return cd->GetData(); - else - return (void*) NULL; + + return node->Data(); } void wxChoice::SetClientObject( int n, wxClientData* clientData ) { - wxCHECK_RET( m_widget != NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); + wxCHECK_RET( m_widget != NULL, _T("invalid combobox") ); + + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return; - + wxClientData *cd = (wxClientData*) node->Data(); if (cd) delete cd; - + node->SetData( (wxObject*) clientData ); } wxClientData* wxChoice::GetClientObject( int n ) { - wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); - - wxNode *node = m_clientDataList.Nth( n ); + wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, _T("invalid combobox") ); + + wxNode *node = m_clientObjectList.Nth( n ); if (!node) return (wxClientData*) NULL; - + return (wxClientData*) node->Data(); } - void wxChoice::Clear() { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_RET( m_widget != NULL, _T("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_clientDataList.First(); + + wxNode *node = m_clientObjectList.First(); while (node) { wxClientData *cd = (wxClientData*)node->Data(); if (cd) delete cd; node = node->Next(); } + m_clientObjectList.Clear(); + m_clientDataList.Clear(); } void wxChoice::Delete( int WXUNUSED(n) ) { - wxFAIL_MSG( "wxChoice:Delete not implemented" ); + wxFAIL_MSG( _T("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, _T("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; @@ -247,16 +243,16 @@ 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 , _T("wxChoice: invalid label") ); + + if (string == label->label) + return count; + child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: string not found" ); - + return -1; } @@ -267,7 +263,7 @@ int wxChoice::GetColumns() const int wxChoice::GetSelection() { - wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, -1, _T("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -279,15 +275,15 @@ int wxChoice::GetSelection() child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: no selection" ); - + + wxFAIL_MSG( _T("wxChoice: no selection") ); + return -1; } wxString wxChoice::GetString( int n ) const { - wxCHECK_MSG( m_widget != NULL, "", "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -300,34 +296,34 @@ 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" ); - + + wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") ); + return label->label; } child = child->next; count++; } - - wxFAIL_MSG( "wxChoice: string not found" ); - + + wxFAIL_MSG( _T("wxChoice: invalid index in GetString()") ); + return ""; } wxString wxChoice::GetStringSelection() const { - wxCHECK_MSG( m_widget != NULL, "", "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, _T(""), _T("invalid choice") ); GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child ); - - wxASSERT_MSG( label != NULL , "wxChoice: invalid label" ); - + + wxASSERT_MSG( label != NULL , _T("wxChoice: invalid label") ); + return label->label; } int wxChoice::Number() const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" ); + wxCHECK_MSG( m_widget != NULL, 0, _T("invalid choice") ); GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) ); int count = 0; @@ -346,17 +342,17 @@ void wxChoice::SetColumns( int WXUNUSED(n) ) void wxChoice::SetSelection( int n ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_RET( m_widget != NULL, _T("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 ) { - wxCHECK_RET( m_widget != NULL, "invalid choice" ); + wxCHECK_RET( m_widget != NULL, _T("invalid choice") ); int n = FindString( string ); if (n != -1) SetSelection( n ); @@ -365,24 +361,24 @@ void wxChoice::SetStringSelection( const wxString &string ) 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; } }