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;
}
}

13
src/gtk1/combobox.cpp
View File

@@ -11,7 +11,6 @@
#pragma implementation "combobox.h"
#endif
#include "wx/combobox.h"
#include <wx/intl.h>
@@ -48,11 +47,9 @@ gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
event.SetInt( combo->GetSelection() );
event.SetString( copystring(combo->GetStringSelection()) );
event.SetString( combo->GetStringSelection() );
event.SetEventObject( combo );
combo->GetEventHandler()->ProcessEvent( event );
delete [] event.GetString();
}
//-----------------------------------------------------------------------------
@@ -63,11 +60,9 @@ static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
{
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
event.SetString( copystring(combo->GetValue()) );
event.SetString( combo->GetValue() );
event.SetEventObject( combo );
combo->GetEventHandler()->ProcessEvent( event );
delete [] event.GetString();
}
//-----------------------------------------------------------------------------
@@ -542,7 +537,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
// all!
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( 0 );
event.SetString( (char *)value.c_str() );
event.SetString( value );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
}
@@ -556,7 +551,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
// and generate the selected event for it
wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, GetId() );
event.SetInt( Number() - 1 );
event.SetString( (char *)value.c_str() );
event.SetString( value );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
}

241
src/gtk1/radiobox.cpp
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -33,7 +33,7 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
{
if (!rb->HasVMT()) return;
if (g_blockEventsOnDrag) return;
if (rb->m_alreadySent)
{
rb->m_alreadySent = FALSE;
@@ -41,11 +41,10 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
}
rb->m_alreadySent = TRUE;
wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
event.SetInt( rb->GetSelection() );
wxString tmp( rb->GetStringSelection() );
event.SetString( WXSTRINGCAST(tmp) );
event.SetString( rb->GetStringSelection() );
event.SetEventObject( rb );
rb->GetEventHandler()->ProcessEvent(event);
}
@@ -66,65 +65,65 @@ wxRadioBox::wxRadioBox(void)
bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint &pos, const wxSize &size,
int n, const wxString choices[], int majorDim,
long style, const wxValidator& validator,
const wxString &name )
int n, const wxString choices[], int majorDim,
long style, const wxValidator& validator,
const wxString &name )
{
m_alreadySent = FALSE;
m_needParent = TRUE;
m_acceptsFocus = TRUE;
PreCreation( parent, id, pos, size, style, name );
SetValidator( validator );
m_widget = gtk_frame_new( title );
m_majorDim = majorDim;
GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
GSList *radio_button_group = (GSList *) NULL;
for (int i = 0; i < n; i++)
{
if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
m_boxes.Append( (wxObject*) m_radio );
ConnectWidget( GTK_WIDGET(m_radio) );
if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
gtk_signal_connect( GTK_OBJECT(m_radio), "clicked",
GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), m_x+10, m_y+10+(i*24) );
}
wxSize ls = LayoutItems();
wxSize newSize = size;
if (newSize.x == -1) newSize.x = ls.x;
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this );
PostCreation();
SetLabel( title );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
Show( TRUE );
return TRUE;
}
@@ -142,7 +141,7 @@ wxRadioBox::~wxRadioBox(void)
void wxRadioBox::OnSize( wxSizeEvent &event )
{
wxControl::OnSize( event );
LayoutItems();
}
@@ -150,55 +149,55 @@ wxSize wxRadioBox::LayoutItems()
{
int x = 7;
int y = 15;
int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
wxSize res( 0, 0 );
if (m_windowStyle & wxRA_HORIZONTAL)
{
for (int j = 0; j < m_majorDim; j++)
{
{
y = 15;
int max_len = 0;
wxNode *node = m_boxes.Nth( j*num_per_major );
for (int i1 = 0; i1< num_per_major; i1++)
{
for (int i1 = 0; i1< num_per_major; i1++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
GdkFont *font = m_widget->style->font;
int len = 22+gdk_string_measure( font, label->label );
if (len > max_len) max_len = len;
gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += 20;
node = node->Next();
if (!node) break;
}
// we don't know the max_len before
node = node->Next();
if (!node) break;
}
// we don't know the max_len before
node = m_boxes.Nth( j*num_per_major );
for (int i2 = 0; i2< num_per_major; i2++)
{
for (int i2 = 0; i2< num_per_major; i2++)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_widget_set_usize( button, max_len, 20 );
node = node->Next();
if (!node) break;
}
if (y > res.y) res.y = y;
x += max_len + 2;
gtk_widget_set_usize( button, max_len, 20 );
node = node->Next();
if (!node) break;
}
if (y > res.y) res.y = y;
x += max_len + 2;
}
res.x = x+4;
res.y += 9;
res.x = x+4;
res.y += 9;
}
else
{
@@ -209,45 +208,45 @@ wxSize wxRadioBox::LayoutItems()
{
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *label = GTK_LABEL( button->child );
GdkFont *font = m_widget->style->font;
int len = 22+gdk_string_measure( font, label->label );
if (len > max) max = len;
node = node->Next();
}
node = m_boxes.First();
while (node)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, m_x+x, m_y+y );
x += max;
gtk_widget_set_usize( button, max, 20 );
node = node->Next();
}
res.x = x+4;
res.y = 42;
res.x = x+4;
res.y = 42;
}
return res;
}
bool wxRadioBox::Show( bool show )
{
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
wxWindow::Show( show );
wxNode *node = m_boxes.First();
while (node)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
node = node->Next();
}
@@ -257,64 +256,64 @@ bool wxRadioBox::Show( bool show )
int wxRadioBox::FindString( const wxString &s ) const
{
wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
int count = 0;
wxNode *node = m_boxes.First();
while (node)
{
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *label = GTK_LABEL( button->child );
if (s == label->label) return count;
count++;
node = node->Next();
}
return -1;
}
void wxRadioBox::SetFocus()
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
if (m_boxes.GetCount() == 0) return;
wxNode *node = m_boxes.First();
while (node)
{
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
if (button->active)
{
{
gtk_widget_grab_focus( GTK_WIDGET(button) );
return;
}
return;
}
node = node->Next();
}
}
void wxRadioBox::SetSelection( int n )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
wxNode *node = m_boxes.Nth( n );
wxCHECK_RET( node, "radiobox wrong index" );
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
gtk_toggle_button_set_state( button, 1 );
}
int wxRadioBox::GetSelection(void) const
{
wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
int count = 0;
wxNode *node = m_boxes.First();
while (node)
{
@@ -323,53 +322,53 @@ int wxRadioBox::GetSelection(void) const
count++;
node = node->Next();
}
wxFAIL_MSG( "wxRadioBox none selected" );
return -1;
}
wxString wxRadioBox::GetString( int n ) const
{
wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
wxNode *node = m_boxes.Nth( n );
wxCHECK_MSG( node, "", "radiobox wrong index" );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *label = GTK_LABEL( button->child );
return wxString( label->label );
}
wxString wxRadioBox::GetLabel( int item ) const
{
wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
return GetString( item );
}
void wxRadioBox::SetLabel( const wxString& label )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
wxControl::SetLabel( label );
gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel() );
}
void wxRadioBox::SetLabel( int item, const wxString& label )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
wxNode *node = m_boxes.Nth( item );
wxCHECK_RET( node, "radiobox wrong index" );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkLabel *g_label = GTK_LABEL( button->child );
gtk_label_set( g_label, label );
}
@@ -381,7 +380,7 @@ void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
void wxRadioBox::Enable( bool enable )
{
wxControl::Enable( enable );
wxNode *node = m_boxes.First();
while (node)
{
@@ -396,11 +395,11 @@ void wxRadioBox::Enable( bool enable )
void wxRadioBox::Enable( int item, bool enable )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
wxNode *node = m_boxes.Nth( item );
wxCHECK_RET( node, "radiobox wrong index" );
GtkButton *button = GTK_BUTTON( node->Data() );
GtkWidget *label = button->child;
gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
@@ -410,11 +409,11 @@ void wxRadioBox::Enable( int item, bool enable )
void wxRadioBox::Show( int item, bool show )
{
wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
wxNode *node = m_boxes.Nth( item );
wxCHECK_RET( node, "radiobox wrong index" );
GtkWidget *button = GTK_WIDGET( node->Data() );
if (show)
@@ -426,7 +425,7 @@ void wxRadioBox::Show( int item, bool show )
wxString wxRadioBox::GetStringSelection(void) const
{
wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
wxNode *node = m_boxes.First();
while (node)
{
@@ -438,19 +437,19 @@ wxString wxRadioBox::GetStringSelection(void) const
}
node = node->Next();
}
wxFAIL_MSG( "wxRadioBox none selected" );
return "";
}
bool wxRadioBox::SetStringSelection( const wxString &s )
{
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
int res = FindString( s );
if (res == -1) return FALSE;
SetSelection( res );
return TRUE;
}
@@ -472,18 +471,18 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
void wxRadioBox::ApplyWidgetStyle()
{
SetWidgetStyle();
gtk_widget_set_style( m_widget, m_widgetStyle );
wxNode *node = m_boxes.First();
while (node)
{
GtkWidget *widget = GTK_WIDGET( node->Data() );
gtk_widget_set_style( widget, m_widgetStyle );
GtkButton *button = GTK_BUTTON( node->Data() );
gtk_widget_set_style( button->child, m_widgetStyle );
node = node->Next();
}
}
@@ -491,16 +490,16 @@ void wxRadioBox::ApplyWidgetStyle()
bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
{
if (window == m_widget->window) return TRUE;
wxNode *node = m_boxes.First();
while (node)
{
GtkWidget *button = GTK_WIDGET( node->Data() );
if (window == button->window) return TRUE;
node = node->Next();
}
return FALSE;
}