Added wxRadioButton (not tested)
Added wxValidator to constructros Added resource.cpp Added parser stuff Added the coolest Makefile.in Added callbacks to Menu Changed parser.y to include lexer.c for wxGTK (Is that right?) Can't remeber havning changed the printing stuff. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,7 +47,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
|
||||
event.SetString( WXSTRINGCAST(tmp) );
|
||||
event.SetEventObject(combo);
|
||||
combo->GetEventHandler()->ProcessEvent(event);
|
||||
};
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// size
|
||||
@@ -63,7 +63,7 @@ static gint gtk_combo_size_callback( GtkCombo *widget, GtkAllocation* alloc, wxC
|
||||
alloc->width - widget->button->allocation.width;
|
||||
|
||||
return FALSE;
|
||||
};
|
||||
}
|
||||
*/
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -73,13 +73,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox,wxControl)
|
||||
bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
const wxPoint& pos, const wxSize& size,
|
||||
int n, const wxString choices[],
|
||||
long style, const wxString& name )
|
||||
long style, const wxValidator& validator, const wxString& name )
|
||||
{
|
||||
m_alreadySent = FALSE;
|
||||
m_needParent = TRUE;
|
||||
|
||||
PreCreation( parent, id, pos, size, style, name );
|
||||
|
||||
SetValidator( validator );
|
||||
|
||||
m_widget = gtk_combo_new();
|
||||
|
||||
wxSize newSize = size;
|
||||
@@ -102,7 +104,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT(list_item), "select",
|
||||
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
|
||||
};
|
||||
}
|
||||
|
||||
PostCreation();
|
||||
|
||||
@@ -116,7 +118,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
|
||||
Show( TRUE );
|
||||
|
||||
return TRUE;
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Clear(void)
|
||||
{
|
||||
@@ -124,12 +126,12 @@ void wxComboBox::Clear(void)
|
||||
gtk_list_clear_items( GTK_LIST(list), 0, Number() );
|
||||
|
||||
m_clientData.Clear();
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Append( const wxString &item )
|
||||
{
|
||||
Append( item, (char*)NULL );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Append( const wxString &item, char *clientData )
|
||||
{
|
||||
@@ -146,7 +148,7 @@ void wxComboBox::Append( const wxString &item, char *clientData )
|
||||
gtk_widget_show( list_item );
|
||||
|
||||
m_clientData.Append( (wxObject*)clientData );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Delete( int n )
|
||||
{
|
||||
@@ -160,7 +162,7 @@ void wxComboBox::Delete( int n )
|
||||
}
|
||||
else
|
||||
m_clientData.DeleteNode( node );
|
||||
};
|
||||
}
|
||||
|
||||
int wxComboBox::FindString( const wxString &item )
|
||||
{
|
||||
@@ -175,12 +177,12 @@ int wxComboBox::FindString( const wxString &item )
|
||||
if (item == label->label) return count;
|
||||
count++;
|
||||
child = child->next;
|
||||
};
|
||||
}
|
||||
|
||||
wxFAIL_MSG( "wxComboBox: string not found" );
|
||||
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
|
||||
char* wxComboBox::GetClientData( int n )
|
||||
{
|
||||
@@ -190,7 +192,7 @@ char* wxComboBox::GetClientData( int n )
|
||||
wxFAIL_MSG( "wxComboBox: wrong index" );
|
||||
|
||||
return NULL;
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetClientData( int n, char * clientData )
|
||||
{
|
||||
@@ -198,7 +200,7 @@ void wxComboBox::SetClientData( int n, char * clientData )
|
||||
if (node) node->SetData( (wxObject*) clientData );
|
||||
|
||||
wxFAIL_MSG( "wxComboBox: wrong index" );
|
||||
};
|
||||
}
|
||||
|
||||
int wxComboBox::GetSelection(void) const
|
||||
{
|
||||
@@ -214,13 +216,13 @@ int wxComboBox::GetSelection(void) const
|
||||
if (child->data == selection->data) return count;
|
||||
count++;
|
||||
child = child->next;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
wxFAIL_MSG( "wxComboBox: no selection" );
|
||||
|
||||
return -1;
|
||||
};
|
||||
}
|
||||
|
||||
wxString wxComboBox::GetString( int n ) const
|
||||
{
|
||||
@@ -232,12 +234,12 @@ wxString wxComboBox::GetString( int n ) const
|
||||
GtkBin *bin = GTK_BIN( child->data );
|
||||
GtkLabel *label = GTK_LABEL( bin->child );
|
||||
return label->label;
|
||||
};
|
||||
}
|
||||
|
||||
wxFAIL_MSG( "wxComboBox: wrong index" );
|
||||
|
||||
return "";
|
||||
};
|
||||
}
|
||||
|
||||
wxString wxComboBox::GetStringSelection(void) const
|
||||
{
|
||||
@@ -249,12 +251,12 @@ wxString wxComboBox::GetStringSelection(void) const
|
||||
GtkBin *bin = GTK_BIN( selection->data );
|
||||
wxString tmp = GTK_LABEL( bin->child )->label;
|
||||
return tmp;
|
||||
};
|
||||
}
|
||||
|
||||
wxFAIL_MSG( "wxComboBox: no selection" );
|
||||
|
||||
return "";
|
||||
};
|
||||
}
|
||||
|
||||
int wxComboBox::Number(void) const
|
||||
{
|
||||
@@ -262,29 +264,29 @@ int wxComboBox::Number(void) const
|
||||
|
||||
GList *child = GTK_LIST(list)->children;
|
||||
int count = 0;
|
||||
while (child) { count++; child = child->next; };
|
||||
while (child) { count++; child = child->next; }
|
||||
return count;
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetSelection( int n )
|
||||
{
|
||||
GtkWidget *list = GTK_COMBO(m_widget)->list;
|
||||
gtk_list_select_item( GTK_LIST(list), n );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetStringSelection( const wxString &string )
|
||||
{
|
||||
int res = FindString( string );
|
||||
if (res == -1) return;
|
||||
SetSelection( res );
|
||||
};
|
||||
}
|
||||
|
||||
wxString wxComboBox::GetValue(void) const
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
wxString tmp = gtk_entry_get_text( GTK_ENTRY(entry) );
|
||||
return tmp;
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetValue( const wxString& value )
|
||||
{
|
||||
@@ -292,52 +294,52 @@ void wxComboBox::SetValue( const wxString& value )
|
||||
wxString tmp = "";
|
||||
if (!value.IsNull()) tmp = value;
|
||||
gtk_entry_set_text( GTK_ENTRY(entry), tmp );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Copy(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
gtk_editable_copy_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Cut(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
gtk_editable_cut_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Paste(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
gtk_editable_paste_clipboard( GTK_EDITABLE(entry), 0 );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetInsertionPoint( long pos )
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
int tmp = (int) pos;
|
||||
gtk_entry_set_position( GTK_ENTRY(entry), tmp );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetInsertionPointEnd(void)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
int pos = GTK_ENTRY(entry)->text_length;
|
||||
SetInsertionPoint( pos-1 );
|
||||
};
|
||||
}
|
||||
|
||||
long wxComboBox::GetInsertionPoint(void) const
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
return (long) GTK_EDITABLE(entry)->current_pos;
|
||||
};
|
||||
}
|
||||
|
||||
long wxComboBox::GetLastPosition(void) const
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
int pos = GTK_ENTRY(entry)->text_length;
|
||||
return (long) pos-1;
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Replace( long from, long to, const wxString& value )
|
||||
{
|
||||
@@ -346,20 +348,20 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
|
||||
if (value.IsNull()) return;
|
||||
gint pos = (gint)to;
|
||||
gtk_editable_insert_text( GTK_EDITABLE(entry), value, value.Length(), &pos );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::Remove(long from, long to)
|
||||
{
|
||||
GtkWidget *entry = GTK_COMBO(m_widget)->entry;
|
||||
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetSelection( long WXUNUSED(from), long WXUNUSED(to) )
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
void wxComboBox::SetEditable( bool WXUNUSED(editable) )
|
||||
{
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user