Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxCommandEvent::SetString() change - now uses wxString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-16 18:54:24 +00:00
parent f42d2aba76
commit 2900641401
14 changed files with 1364 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
src/gtk1/choice.cpp
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -29,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);
}
@@ -56,53 +58,55 @@ 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 );
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] );
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()
{
Clear();
@@ -111,20 +115,20 @@ wxChoice::~wxChoice()
void wxChoice::AppendCommon( const wxString &item )
{
wxCHECK_RET( m_widget != NULL, "invalid choice" );
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
GtkWidget *menu_item = gtk_menu_item_new_with_label( item );
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",
gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
gtk_widget_show( menu_item );
}
@@ -132,7 +136,7 @@ void wxChoice::Append( const wxString &item )
{
m_clientDataList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) NULL );
AppendCommon( item );
}
@@ -140,7 +144,7 @@ void wxChoice::Append( const wxString &item, void *clientData )
{
m_clientDataList.Append( (wxObject*) clientData );
m_clientObjectList.Append( (wxObject*) NULL );
AppendCommon( item );
}
@@ -148,53 +152,53 @@ void wxChoice::Append( const wxString &item, wxClientData *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" );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return;
node->SetData( (wxObject*) clientData );
}
void* wxChoice::GetClientData( int n )
{
wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL;
return node->Data();
}
void wxChoice::SetClientObject( int n, wxClientData* clientData )
{
wxCHECK_RET( m_widget != NULL, "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_clientObjectList.Nth( n );
if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data();
}
void wxChoice::Clear()
{
wxCHECK_RET( m_widget != NULL, "invalid choice" );
@@ -202,7 +206,7 @@ void wxChoice::Clear()
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)
{
@@ -211,7 +215,7 @@ void wxChoice::Clear()
node = node->Next();
}
m_clientObjectList.Clear();
m_clientDataList.Clear();
}
@@ -226,7 +230,7 @@ int wxChoice::FindString( const wxString &string ) const
// 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,16 +240,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;
if (string == label->label)
return count;
child = child->next;
count++;
}
wxFAIL_MSG( "wxChoice: string not found" );
return -1;
}
@@ -268,9 +272,9 @@ int wxChoice::GetSelection()
child = child->next;
count++;
}
wxFAIL_MSG( "wxChoice: no selection" );
return -1;
}
@@ -289,17 +293,17 @@ 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;
}
child = child->next;
count++;
}
wxFAIL_MSG( "wxChoice: string not found" );
wxFAIL_MSG( "wxChoice: invalid index in GetString()" );
return "";
}
@@ -308,9 +312,9 @@ wxString wxChoice::GetStringSelection() const
wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
return label->label;
}
@@ -339,7 +343,7 @@ void wxChoice::SetSelection( int n )
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
gtk_choice_clicked_callback( (GtkWidget *) NULL, this );
}
@@ -354,24 +358,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;
}
}