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

SetInsertionPointEnd() bug corrected (was off by 1)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-01-26 12:56:58 +00:00
parent 1eddcfafba
commit 805dd538bb
4 changed files with 258 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
src/gtk/combobox.cpp
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -33,7 +33,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
{ {
if (!combo->HasVMT()) return; if (!combo->HasVMT()) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
if (combo->m_alreadySent) if (combo->m_alreadySent)
{ {
combo->m_alreadySent = FALSE; combo->m_alreadySent = FALSE;
@@ -41,7 +41,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
} }
combo->m_alreadySent = TRUE; combo->m_alreadySent = TRUE;
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId()); wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
event.SetInt( combo->GetSelection() ); event.SetInt( combo->GetSelection() );
wxString tmp( combo->GetStringSelection() ); wxString tmp( combo->GetStringSelection() );
@@ -77,66 +77,66 @@ END_EVENT_TABLE()
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
int n, const wxString choices[], int n, const wxString choices[],
long style, const wxValidator& validator, long style, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_alreadySent = FALSE; m_alreadySent = FALSE;
m_needParent = TRUE; m_needParent = TRUE;
m_acceptsFocus = TRUE; m_acceptsFocus = TRUE;
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_widget = gtk_combo_new(); m_widget = gtk_combo_new();
wxSize newSize = size; wxSize newSize = size;
if (newSize.x == -1) newSize.x = 100; if (newSize.x == -1) newSize.x = 100;
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
m_clientDataList.Append( (wxObject*)NULL ); m_clientDataList.Append( (wxObject*)NULL );
m_clientObjectList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL );
gtk_container_add( GTK_CONTAINER(list), list_item ); gtk_container_add( GTK_CONTAINER(list), list_item );
gtk_widget_realize( list_item ); gtk_widget_realize( list_item );
gtk_widget_realize( GTK_BIN(list_item)->child ); gtk_widget_realize( GTK_BIN(list_item)->child );
gtk_widget_show( list_item ); gtk_widget_show( list_item );
gtk_signal_connect( GTK_OBJECT(list_item), "select", gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
} }
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( GTK_COMBO(m_widget)->button );
if (!value.IsNull()) SetValue( value ); if (!value.IsNull()) SetValue( value );
gtk_widget_realize( GTK_COMBO(m_widget)->list ); gtk_widget_realize( GTK_COMBO(m_widget)->list );
gtk_widget_realize( GTK_COMBO(m_widget)->entry ); gtk_widget_realize( GTK_COMBO(m_widget)->entry );
gtk_widget_realize( GTK_COMBO(m_widget)->button ); gtk_widget_realize( GTK_COMBO(m_widget)->button );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@@ -155,18 +155,18 @@ wxComboBox::~wxComboBox()
void wxComboBox::AppendCommon( const wxString &item ) void wxComboBox::AppendCommon( const wxString &item )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GtkWidget *list_item = gtk_list_item_new_with_label( item ); GtkWidget *list_item = gtk_list_item_new_with_label( item );
gtk_signal_connect( GTK_OBJECT(list_item), "select", gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
gtk_container_add( GTK_CONTAINER(list), list_item ); gtk_container_add( GTK_CONTAINER(list), list_item );
if (m_widgetStyle) ApplyWidgetStyle(); if (m_widgetStyle) ApplyWidgetStyle();
gtk_widget_show( list_item ); gtk_widget_show( list_item );
} }
@@ -174,7 +174,7 @@ void wxComboBox::Append( const wxString &item )
{ {
m_clientDataList.Append( (wxObject*) NULL ); m_clientDataList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL );
AppendCommon( item ); AppendCommon( item );
} }
@@ -182,7 +182,7 @@ void wxComboBox::Append( const wxString &item, void *clientData )
{ {
m_clientDataList.Append( (wxObject*) clientData ); m_clientDataList.Append( (wxObject*) clientData );
m_clientObjectList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL );
AppendCommon( item ); AppendCommon( item );
} }
@@ -190,60 +190,60 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData )
{ {
m_clientDataList.Append( (wxObject*) NULL ); m_clientDataList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*) clientData );
AppendCommon( item ); AppendCommon( item );
} }
void wxComboBox::SetClientData( int n, void* clientData ) void wxComboBox::SetClientData( int n, void* clientData )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return; if (!node) return;
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
void* wxComboBox::GetClientData( int n ) void* wxComboBox::GetClientData( int n )
{ {
wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL; if (!node) return NULL;
return node->Data(); return node->Data();
} }
void wxComboBox::SetClientObject( int n, wxClientData* clientData ) void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
wxNode *node = m_clientObjectList.Nth( n ); wxNode *node = m_clientObjectList.Nth( n );
if (!node) return; if (!node) return;
wxClientData *cd = (wxClientData*) node->Data(); wxClientData *cd = (wxClientData*) node->Data();
if (cd) delete cd; if (cd) delete cd;
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
wxClientData* wxComboBox::GetClientObject( int n ) wxClientData* wxComboBox::GetClientObject( int n )
{ {
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return (wxClientData*) NULL; if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data(); return (wxClientData*) node->Data();
} }
void wxComboBox::Clear() void wxComboBox::Clear()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, Number() ); gtk_list_clear_items( GTK_LIST(list), 0, Number() );
wxNode *node = m_clientObjectList.First(); wxNode *node = m_clientObjectList.First();
while (node) while (node)
{ {
@@ -252,28 +252,28 @@ void wxComboBox::Clear()
node = node->Next(); node = node->Next();
} }
m_clientObjectList.Clear(); m_clientObjectList.Clear();
m_clientDataList.Clear(); m_clientDataList.Clear();
} }
void wxComboBox::Delete( int n ) void wxComboBox::Delete( int n )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
GList *child = g_list_nth( listbox->children, n ); GList *child = g_list_nth( listbox->children, n );
if (!child) if (!child)
{ {
wxFAIL_MSG("wrong index"); wxFAIL_MSG("wrong index");
return; return;
} }
GList *list = g_list_append( (GList*) NULL, child->data ); GList *list = g_list_append( (GList*) NULL, child->data );
gtk_list_remove_items( listbox, list ); gtk_list_remove_items( listbox, list );
g_list_free( list ); g_list_free( list );
wxNode *node = m_clientObjectList.Nth( n ); wxNode *node = m_clientObjectList.Nth( n );
if (node) if (node)
{ {
@@ -281,7 +281,7 @@ void wxComboBox::Delete( int n )
if (cd) delete cd; if (cd) delete cd;
m_clientObjectList.DeleteNode( node ); m_clientObjectList.DeleteNode( node );
} }
node = m_clientDataList.Nth( n ); node = m_clientDataList.Nth( n );
if (node) if (node)
{ {
@@ -292,9 +292,9 @@ void wxComboBox::Delete( int n )
int wxComboBox::FindString( const wxString &item ) int wxComboBox::FindString( const wxString &item )
{ {
wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children; GList *child = GTK_LIST(list)->children;
int count = 0; int count = 0;
while (child) while (child)
@@ -305,18 +305,18 @@ int wxComboBox::FindString( const wxString &item )
count++; count++;
child = child->next; child = child->next;
} }
wxFAIL_MSG( "wxComboBox: string not found" ); wxFAIL_MSG( "wxComboBox: string not found" );
return -1; return -1;
} }
int wxComboBox::GetSelection() const int wxComboBox::GetSelection() const
{ {
wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *selection = GTK_LIST(list)->selection; GList *selection = GTK_LIST(list)->selection;
if (selection) if (selection)
{ {
@@ -329,18 +329,18 @@ int wxComboBox::GetSelection() const
child = child->next; child = child->next;
} }
} }
wxFAIL_MSG( "wxComboBox: no selection" ); wxFAIL_MSG( "wxComboBox: no selection" );
return -1; return -1;
} }
wxString wxComboBox::GetString( int n ) const wxString wxComboBox::GetString( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = g_list_nth( GTK_LIST(list)->children, n ); GList *child = g_list_nth( GTK_LIST(list)->children, n );
if (child) if (child)
{ {
@@ -348,18 +348,18 @@ wxString wxComboBox::GetString( int n ) const
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
return label->label; return label->label;
} }
wxFAIL_MSG( "wxComboBox: wrong index" ); wxFAIL_MSG( "wxComboBox: wrong index" );
return ""; return "";
} }
wxString wxComboBox::GetStringSelection() const wxString wxComboBox::GetStringSelection() const
{ {
wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *selection = GTK_LIST(list)->selection; GList *selection = GTK_LIST(list)->selection;
if (selection) if (selection)
{ {
@@ -367,18 +367,18 @@ wxString wxComboBox::GetStringSelection() const
wxString tmp = GTK_LABEL( bin->child )->label; wxString tmp = GTK_LABEL( bin->child )->label;
return tmp; return tmp;
} }
wxFAIL_MSG( "wxComboBox: no selection" ); wxFAIL_MSG( "wxComboBox: no selection" );
return ""; return "";
} }
int wxComboBox::Number() const int wxComboBox::Number() const
{ {
wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children; GList *child = GTK_LIST(list)->children;
int count = 0; int count = 0;
while (child) { count++; child = child->next; } while (child) { count++; child = child->next; }
@@ -388,7 +388,7 @@ int wxComboBox::Number() const
void wxComboBox::SetSelection( int n ) void wxComboBox::SetSelection( int n )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n ); gtk_list_select_item( GTK_LIST(list), n );
} }
@@ -396,7 +396,7 @@ void wxComboBox::SetSelection( int n )
void wxComboBox::SetStringSelection( const wxString &string ) void wxComboBox::SetStringSelection( const wxString &string )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
int res = FindString( string ); int res = FindString( string );
if (res == -1) return; if (res == -1) return;
SetSelection( res ); SetSelection( res );
@@ -412,7 +412,7 @@ wxString wxComboBox::GetValue() const
void wxComboBox::SetValue( const wxString& value ) void wxComboBox::SetValue( const wxString& value )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
wxString tmp = ""; wxString tmp = "";
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
@@ -422,7 +422,7 @@ void wxComboBox::SetValue( const wxString& value )
void wxComboBox::Copy() void wxComboBox::Copy()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
@@ -434,7 +434,7 @@ void wxComboBox::Copy()
void wxComboBox::Cut() void wxComboBox::Cut()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
@@ -446,7 +446,7 @@ void wxComboBox::Cut()
void wxComboBox::Paste() void wxComboBox::Paste()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
@@ -458,19 +458,16 @@ void wxComboBox::Paste()
void wxComboBox::SetInsertionPoint( long pos ) void wxComboBox::SetInsertionPoint( long pos )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int tmp = (int) pos; gtk_entry_set_position( GTK_ENTRY(entry), (int)tmp );
gtk_entry_set_position( GTK_ENTRY(entry), tmp );
} }
void wxComboBox::SetInsertionPointEnd() void wxComboBox::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; SetInsertionPoint( -1 );
int pos = GTK_ENTRY(entry)->text_length;
SetInsertionPoint( pos-1 );
} }
long wxComboBox::GetInsertionPoint() const long wxComboBox::GetInsertionPoint() const
@@ -489,7 +486,7 @@ long wxComboBox::GetLastPosition() const
void wxComboBox::Replace( long from, long to, const wxString& value ) void wxComboBox::Replace( long from, long to, const wxString& value )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
if (value.IsNull()) return; if (value.IsNull()) return;
@@ -500,7 +497,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
void wxComboBox::Remove(long from, long to) void wxComboBox::Remove(long from, long to)
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
} }
@@ -518,10 +515,10 @@ void wxComboBox::SetEditable( bool WXUNUSED(editable) )
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )
{ {
wxControl::OnSize( event ); wxControl::OnSize( event );
int w = 21; int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height ); gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y ); gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height ); gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
} }
@@ -529,20 +526,20 @@ void wxComboBox::OnSize( wxSizeEvent &event )
void wxComboBox::ApplyWidgetStyle() void wxComboBox::ApplyWidgetStyle()
{ {
SetWidgetStyle(); SetWidgetStyle();
gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
GList *child = list->children; GList *child = list->children;
while (child) while (child)
{ {
gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
GtkBin *bin = GTK_BIN(child->data); GtkBin *bin = GTK_BIN(child->data);
gtk_widget_set_style( bin->child, m_widgetStyle ); gtk_widget_set_style( bin->child, m_widgetStyle );
child = child->next; child = child->next;
} }
} }

86
src/gtk/textctrl.cpp
View File

@@ -34,11 +34,11 @@ extern bool g_blockEventsOnDrag;
// "changed" // "changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
win->SetModified(); win->SetModified();
win->CalculateScrollbar(); win->CalculateScrollbar();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
@@ -52,7 +52,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
// "size_allocate" // "size_allocate"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win ) gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
{ {
win->CalculateScrollbar(); win->CalculateScrollbar();
@@ -112,7 +112,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
bool multi_line = (style & wxTE_MULTILINE) != 0; bool multi_line = (style & wxTE_MULTILINE) != 0;
@@ -121,7 +121,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
// a multi-line edit control: create a vertical scrollbar by default and // a multi-line edit control: create a vertical scrollbar by default and
// horizontal if requested // horizontal if requested
bool bHasHScrollbar = (style & wxHSCROLL) != 0; bool bHasHScrollbar = (style & wxHSCROLL) != 0;
// create our control... // create our control...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -150,7 +150,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
} }
@@ -205,9 +205,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
if (multi_line) if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 ); gtk_text_set_editable( GTK_TEXT(m_text), 1 );
} }
Show( TRUE ); Show( TRUE );
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
@@ -219,23 +219,23 @@ void wxTextCtrl::CalculateScrollbar()
if ((m_windowStyle & wxTE_MULTILINE) == 0) return; if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
if (adj->upper - adj->page_size < 0.8) if (adj->upper - adj->page_size < 0.8)
{ {
if (m_vScrollbarVisible) if (m_vScrollbarVisible)
{ {
gtk_widget_hide( m_vScrollbar ); gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE; m_vScrollbarVisible = FALSE;
} }
} }
else else
{ {
if (!m_vScrollbarVisible) if (!m_vScrollbarVisible)
{ {
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
} }
} }
} }
@@ -321,8 +321,8 @@ bool wxTextCtrl::LoadFile( const wxString &file )
return FALSE; return FALSE;
} }
if (fread (text, sizeof (char), len, fp) != (size_t) len) if (fread (text, sizeof (char), len, fp) != (size_t) len)
{ {
} }
fclose (fp); fclose (fp);
text[len] = 0; text[len] = 0;
@@ -372,13 +372,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
} }
if (fwrite (text, sizeof (char), len, fp) != (size_t) len) if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
{ {
// Did not write whole file // Did not write whole file
} }
// Make sure newline terminates the file // Make sure newline terminates the file
if (text[len - 1] != '\n') if (text[len - 1] != '\n')
fputc ('\n', fp); fputc ('\n', fp);
fclose (fp); fclose (fp);
@@ -445,12 +445,12 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
for (int i = 0; i < pos; i++ ) for (int i = 0; i < pos; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
{ {
(*y)++; (*y)++;
*x=1; *x=1;
} }
else else
(*x)++; (*x)++;
} }
g_free( text ); g_free( text );
return 1; return 1;
@@ -459,11 +459,11 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) return 0; if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
long pos=0; long pos=0;
for( int i=1; i<y; i++ ) pos += GetLineLength(i); for( int i=1; i<y; i++ ) pos += GetLineLength(i);
pos +=x-1; // Pos start with 0 pos +=x-1; // Pos start with 0
return pos; return pos;
} }
@@ -485,17 +485,17 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
int currentLine = 0; int currentLine = 0;
for (int i = 0; i < len; i++ ) for (int i = 0; i < len; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
currentLine++; currentLine++;
} }
g_free( text ); g_free( text );
return currentLine; return currentLine;
} }
else else
{ {
return 0; return 0;
} }
} }
else else
{ {
@@ -518,13 +518,7 @@ void wxTextCtrl::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int pos = 0; SetInsertionPoint(-1);
if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) );
else
pos = GTK_ENTRY(m_text)->text_length;
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
} }
void wxTextCtrl::SetEditable( bool editable ) void wxTextCtrl::SetEditable( bool editable )
@@ -565,7 +559,7 @@ long wxTextCtrl::GetLastPosition() const
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
return (long)pos-1; return (long)pos-1;
} }
@@ -627,7 +621,7 @@ void wxTextCtrl::Clear()
void wxTextCtrl::OnChar( wxKeyEvent &key_event ) void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
{ {
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
@@ -751,13 +745,13 @@ void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
wxControl::SetBackgroundColour( colour ); wxControl::SetBackgroundColour( colour );
wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() && if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() && sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue()) sysbg.Blue() == colour.Blue())
{ {
return; return;
} }
if (!m_backgroundColour.Ok()) return; if (!m_backgroundColour.Ok()) return;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
@@ -774,7 +768,7 @@ void wxTextCtrl::ApplyWidgetStyle()
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
// how ? // how ?
} }
else else
{ {
SetWidgetStyle(); SetWidgetStyle();

181
src/gtk1/combobox.cpp
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -33,7 +33,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
{ {
if (!combo->HasVMT()) return; if (!combo->HasVMT()) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
if (combo->m_alreadySent) if (combo->m_alreadySent)
{ {
combo->m_alreadySent = FALSE; combo->m_alreadySent = FALSE;
@@ -41,7 +41,7 @@ static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox
} }
combo->m_alreadySent = TRUE; combo->m_alreadySent = TRUE;
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId()); wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, combo->GetId());
event.SetInt( combo->GetSelection() ); event.SetInt( combo->GetSelection() );
wxString tmp( combo->GetStringSelection() ); wxString tmp( combo->GetStringSelection() );
@@ -77,66 +77,66 @@ END_EVENT_TABLE()
bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
int n, const wxString choices[], int n, const wxString choices[],
long style, const wxValidator& validator, long style, const wxValidator& validator,
const wxString& name ) const wxString& name )
{ {
m_alreadySent = FALSE; m_alreadySent = FALSE;
m_needParent = TRUE; m_needParent = TRUE;
m_acceptsFocus = TRUE; m_acceptsFocus = TRUE;
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_widget = gtk_combo_new(); m_widget = gtk_combo_new();
wxSize newSize = size; wxSize newSize = size;
if (newSize.x == -1) newSize.x = 100; if (newSize.x == -1) newSize.x = 100;
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] ); GtkWidget *list_item = gtk_list_item_new_with_label( choices[i] );
m_clientDataList.Append( (wxObject*)NULL ); m_clientDataList.Append( (wxObject*)NULL );
m_clientObjectList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL );
gtk_container_add( GTK_CONTAINER(list), list_item ); gtk_container_add( GTK_CONTAINER(list), list_item );
gtk_widget_realize( list_item ); gtk_widget_realize( list_item );
gtk_widget_realize( GTK_BIN(list_item)->child ); gtk_widget_realize( GTK_BIN(list_item)->child );
gtk_widget_show( list_item ); gtk_widget_show( list_item );
gtk_signal_connect( GTK_OBJECT(list_item), "select", gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
} }
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
ConnectWidget( GTK_COMBO(m_widget)->button ); ConnectWidget( GTK_COMBO(m_widget)->button );
if (!value.IsNull()) SetValue( value ); if (!value.IsNull()) SetValue( value );
gtk_widget_realize( GTK_COMBO(m_widget)->list ); gtk_widget_realize( GTK_COMBO(m_widget)->list );
gtk_widget_realize( GTK_COMBO(m_widget)->entry ); gtk_widget_realize( GTK_COMBO(m_widget)->entry );
gtk_widget_realize( GTK_COMBO(m_widget)->button ); gtk_widget_realize( GTK_COMBO(m_widget)->button );
gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed", gtk_signal_connect( GTK_OBJECT(GTK_COMBO(m_widget)->entry), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@@ -155,18 +155,18 @@ wxComboBox::~wxComboBox()
void wxComboBox::AppendCommon( const wxString &item ) void wxComboBox::AppendCommon( const wxString &item )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GtkWidget *list_item = gtk_list_item_new_with_label( item ); GtkWidget *list_item = gtk_list_item_new_with_label( item );
gtk_signal_connect( GTK_OBJECT(list_item), "select", gtk_signal_connect( GTK_OBJECT(list_item), "select",
GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
gtk_container_add( GTK_CONTAINER(list), list_item ); gtk_container_add( GTK_CONTAINER(list), list_item );
if (m_widgetStyle) ApplyWidgetStyle(); if (m_widgetStyle) ApplyWidgetStyle();
gtk_widget_show( list_item ); gtk_widget_show( list_item );
} }
@@ -174,7 +174,7 @@ void wxComboBox::Append( const wxString &item )
{ {
m_clientDataList.Append( (wxObject*) NULL ); m_clientDataList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) NULL ); m_clientObjectList.Append( (wxObject*) NULL );
AppendCommon( item ); AppendCommon( item );
} }
@@ -182,7 +182,7 @@ void wxComboBox::Append( const wxString &item, void *clientData )
{ {
m_clientDataList.Append( (wxObject*) clientData ); m_clientDataList.Append( (wxObject*) clientData );
m_clientObjectList.Append( (wxObject*)NULL ); m_clientObjectList.Append( (wxObject*)NULL );
AppendCommon( item ); AppendCommon( item );
} }
@@ -190,60 +190,60 @@ void wxComboBox::Append( const wxString &item, wxClientData *clientData )
{ {
m_clientDataList.Append( (wxObject*) NULL ); m_clientDataList.Append( (wxObject*) NULL );
m_clientObjectList.Append( (wxObject*) clientData ); m_clientObjectList.Append( (wxObject*) clientData );
AppendCommon( item ); AppendCommon( item );
} }
void wxComboBox::SetClientData( int n, void* clientData ) void wxComboBox::SetClientData( int n, void* clientData )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return; if (!node) return;
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
void* wxComboBox::GetClientData( int n ) void* wxComboBox::GetClientData( int n )
{ {
wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL; if (!node) return NULL;
return node->Data(); return node->Data();
} }
void wxComboBox::SetClientObject( int n, wxClientData* clientData ) void wxComboBox::SetClientObject( int n, wxClientData* clientData )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
wxNode *node = m_clientObjectList.Nth( n ); wxNode *node = m_clientObjectList.Nth( n );
if (!node) return; if (!node) return;
wxClientData *cd = (wxClientData*) node->Data(); wxClientData *cd = (wxClientData*) node->Data();
if (cd) delete cd; if (cd) delete cd;
node->SetData( (wxObject*) clientData ); node->SetData( (wxObject*) clientData );
} }
wxClientData* wxComboBox::GetClientObject( int n ) wxClientData* wxComboBox::GetClientObject( int n )
{ {
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, "invalid combobox" );
wxNode *node = m_clientDataList.Nth( n ); wxNode *node = m_clientDataList.Nth( n );
if (!node) return (wxClientData*) NULL; if (!node) return (wxClientData*) NULL;
return (wxClientData*) node->Data(); return (wxClientData*) node->Data();
} }
void wxComboBox::Clear() void wxComboBox::Clear()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_clear_items( GTK_LIST(list), 0, Number() ); gtk_list_clear_items( GTK_LIST(list), 0, Number() );
wxNode *node = m_clientObjectList.First(); wxNode *node = m_clientObjectList.First();
while (node) while (node)
{ {
@@ -252,28 +252,28 @@ void wxComboBox::Clear()
node = node->Next(); node = node->Next();
} }
m_clientObjectList.Clear(); m_clientObjectList.Clear();
m_clientDataList.Clear(); m_clientDataList.Clear();
} }
void wxComboBox::Delete( int n ) void wxComboBox::Delete( int n )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list ); GtkList *listbox = GTK_LIST( GTK_COMBO(m_widget)->list );
GList *child = g_list_nth( listbox->children, n ); GList *child = g_list_nth( listbox->children, n );
if (!child) if (!child)
{ {
wxFAIL_MSG("wrong index"); wxFAIL_MSG("wrong index");
return; return;
} }
GList *list = g_list_append( (GList*) NULL, child->data ); GList *list = g_list_append( (GList*) NULL, child->data );
gtk_list_remove_items( listbox, list ); gtk_list_remove_items( listbox, list );
g_list_free( list ); g_list_free( list );
wxNode *node = m_clientObjectList.Nth( n ); wxNode *node = m_clientObjectList.Nth( n );
if (node) if (node)
{ {
@@ -281,7 +281,7 @@ void wxComboBox::Delete( int n )
if (cd) delete cd; if (cd) delete cd;
m_clientObjectList.DeleteNode( node ); m_clientObjectList.DeleteNode( node );
} }
node = m_clientDataList.Nth( n ); node = m_clientDataList.Nth( n );
if (node) if (node)
{ {
@@ -292,9 +292,9 @@ void wxComboBox::Delete( int n )
int wxComboBox::FindString( const wxString &item ) int wxComboBox::FindString( const wxString &item )
{ {
wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children; GList *child = GTK_LIST(list)->children;
int count = 0; int count = 0;
while (child) while (child)
@@ -305,18 +305,18 @@ int wxComboBox::FindString( const wxString &item )
count++; count++;
child = child->next; child = child->next;
} }
wxFAIL_MSG( "wxComboBox: string not found" ); wxFAIL_MSG( "wxComboBox: string not found" );
return -1; return -1;
} }
int wxComboBox::GetSelection() const int wxComboBox::GetSelection() const
{ {
wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, -1, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *selection = GTK_LIST(list)->selection; GList *selection = GTK_LIST(list)->selection;
if (selection) if (selection)
{ {
@@ -329,18 +329,18 @@ int wxComboBox::GetSelection() const
child = child->next; child = child->next;
} }
} }
wxFAIL_MSG( "wxComboBox: no selection" ); wxFAIL_MSG( "wxComboBox: no selection" );
return -1; return -1;
} }
wxString wxComboBox::GetString( int n ) const wxString wxComboBox::GetString( int n ) const
{ {
wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = g_list_nth( GTK_LIST(list)->children, n ); GList *child = g_list_nth( GTK_LIST(list)->children, n );
if (child) if (child)
{ {
@@ -348,18 +348,18 @@ wxString wxComboBox::GetString( int n ) const
GtkLabel *label = GTK_LABEL( bin->child ); GtkLabel *label = GTK_LABEL( bin->child );
return label->label; return label->label;
} }
wxFAIL_MSG( "wxComboBox: wrong index" ); wxFAIL_MSG( "wxComboBox: wrong index" );
return ""; return "";
} }
wxString wxComboBox::GetStringSelection() const wxString wxComboBox::GetStringSelection() const
{ {
wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, "", "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *selection = GTK_LIST(list)->selection; GList *selection = GTK_LIST(list)->selection;
if (selection) if (selection)
{ {
@@ -367,18 +367,18 @@ wxString wxComboBox::GetStringSelection() const
wxString tmp = GTK_LABEL( bin->child )->label; wxString tmp = GTK_LABEL( bin->child )->label;
return tmp; return tmp;
} }
wxFAIL_MSG( "wxComboBox: no selection" ); wxFAIL_MSG( "wxComboBox: no selection" );
return ""; return "";
} }
int wxComboBox::Number() const int wxComboBox::Number() const
{ {
wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" ); wxCHECK_MSG( m_widget != NULL, 0, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
GList *child = GTK_LIST(list)->children; GList *child = GTK_LIST(list)->children;
int count = 0; int count = 0;
while (child) { count++; child = child->next; } while (child) { count++; child = child->next; }
@@ -388,7 +388,7 @@ int wxComboBox::Number() const
void wxComboBox::SetSelection( int n ) void wxComboBox::SetSelection( int n )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *list = GTK_COMBO(m_widget)->list; GtkWidget *list = GTK_COMBO(m_widget)->list;
gtk_list_select_item( GTK_LIST(list), n ); gtk_list_select_item( GTK_LIST(list), n );
} }
@@ -396,7 +396,7 @@ void wxComboBox::SetSelection( int n )
void wxComboBox::SetStringSelection( const wxString &string ) void wxComboBox::SetStringSelection( const wxString &string )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
int res = FindString( string ); int res = FindString( string );
if (res == -1) return; if (res == -1) return;
SetSelection( res ); SetSelection( res );
@@ -412,7 +412,7 @@ wxString wxComboBox::GetValue() const
void wxComboBox::SetValue( const wxString& value ) void wxComboBox::SetValue( const wxString& value )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
wxString tmp = ""; wxString tmp = "";
if (!value.IsNull()) tmp = value; if (!value.IsNull()) tmp = value;
@@ -422,7 +422,7 @@ void wxComboBox::SetValue( const wxString& value )
void wxComboBox::Copy() void wxComboBox::Copy()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_copy_clipboard( GTK_EDITABLE(entry) ); gtk_editable_copy_clipboard( GTK_EDITABLE(entry) );
@@ -434,7 +434,7 @@ void wxComboBox::Copy()
void wxComboBox::Cut() void wxComboBox::Cut()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_cut_clipboard( GTK_EDITABLE(entry) ); gtk_editable_cut_clipboard( GTK_EDITABLE(entry) );
@@ -446,7 +446,7 @@ void wxComboBox::Cut()
void wxComboBox::Paste() void wxComboBox::Paste()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
#if (GTK_MINOR_VERSION == 1) #if (GTK_MINOR_VERSION == 1)
gtk_editable_paste_clipboard( GTK_EDITABLE(entry) ); gtk_editable_paste_clipboard( GTK_EDITABLE(entry) );
@@ -458,19 +458,16 @@ void wxComboBox::Paste()
void wxComboBox::SetInsertionPoint( long pos ) void wxComboBox::SetInsertionPoint( long pos )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
int tmp = (int) pos; gtk_entry_set_position( GTK_ENTRY(entry), (int)tmp );
gtk_entry_set_position( GTK_ENTRY(entry), tmp );
} }
void wxComboBox::SetInsertionPointEnd() void wxComboBox::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; SetInsertionPoint( -1 );
int pos = GTK_ENTRY(entry)->text_length;
SetInsertionPoint( pos-1 );
} }
long wxComboBox::GetInsertionPoint() const long wxComboBox::GetInsertionPoint() const
@@ -489,7 +486,7 @@ long wxComboBox::GetLastPosition() const
void wxComboBox::Replace( long from, long to, const wxString& value ) void wxComboBox::Replace( long from, long to, const wxString& value )
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
if (value.IsNull()) return; if (value.IsNull()) return;
@@ -500,7 +497,7 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
void wxComboBox::Remove(long from, long to) void wxComboBox::Remove(long from, long to)
{ {
wxCHECK_RET( m_widget != NULL, "invalid combobox" ); wxCHECK_RET( m_widget != NULL, "invalid combobox" );
GtkWidget *entry = GTK_COMBO(m_widget)->entry; GtkWidget *entry = GTK_COMBO(m_widget)->entry;
gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to ); gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
} }
@@ -518,10 +515,10 @@ void wxComboBox::SetEditable( bool WXUNUSED(editable) )
void wxComboBox::OnSize( wxSizeEvent &event ) void wxComboBox::OnSize( wxSizeEvent &event )
{ {
wxControl::OnSize( event ); wxControl::OnSize( event );
int w = 21; int w = 21;
gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height ); gtk_widget_set_usize( GTK_COMBO(m_widget)->entry, m_width-w-1, m_height );
gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y ); gtk_widget_set_uposition( GTK_COMBO(m_widget)->button, m_x+m_width-w, m_y );
gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height ); gtk_widget_set_usize( GTK_COMBO(m_widget)->button, w, m_height );
} }
@@ -529,20 +526,20 @@ void wxComboBox::OnSize( wxSizeEvent &event )
void wxComboBox::ApplyWidgetStyle() void wxComboBox::ApplyWidgetStyle()
{ {
SetWidgetStyle(); SetWidgetStyle();
gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->button, m_widgetStyle );
gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->entry, m_widgetStyle );
gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle ); gtk_widget_set_style( GTK_COMBO(m_widget)->list, m_widgetStyle );
GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list ); GtkList *list = GTK_LIST( GTK_COMBO(m_widget)->list );
GList *child = list->children; GList *child = list->children;
while (child) while (child)
{ {
gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle ); gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
GtkBin *bin = GTK_BIN(child->data); GtkBin *bin = GTK_BIN(child->data);
gtk_widget_set_style( bin->child, m_widgetStyle ); gtk_widget_set_style( bin->child, m_widgetStyle );
child = child->next; child = child->next;
} }
} }

86
src/gtk1/textctrl.cpp
View File

@@ -34,11 +34,11 @@ extern bool g_blockEventsOnDrag;
// "changed" // "changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{ {
win->SetModified(); win->SetModified();
win->CalculateScrollbar(); win->CalculateScrollbar();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
@@ -52,7 +52,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
// "size_allocate" // "size_allocate"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void static void
gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win ) gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
{ {
win->CalculateScrollbar(); win->CalculateScrollbar();
@@ -112,7 +112,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
PreCreation( parent, id, pos, size, style, name ); PreCreation( parent, id, pos, size, style, name );
SetValidator( validator ); SetValidator( validator );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
bool multi_line = (style & wxTE_MULTILINE) != 0; bool multi_line = (style & wxTE_MULTILINE) != 0;
@@ -121,7 +121,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
// a multi-line edit control: create a vertical scrollbar by default and // a multi-line edit control: create a vertical scrollbar by default and
// horizontal if requested // horizontal if requested
bool bHasHScrollbar = (style & wxHSCROLL) != 0; bool bHasHScrollbar = (style & wxHSCROLL) != 0;
// create our control... // create our control...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -150,7 +150,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this ); GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
} }
@@ -205,9 +205,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
if (multi_line) if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 ); gtk_text_set_editable( GTK_TEXT(m_text), 1 );
} }
Show( TRUE ); Show( TRUE );
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
@@ -219,23 +219,23 @@ void wxTextCtrl::CalculateScrollbar()
if ((m_windowStyle & wxTE_MULTILINE) == 0) return; if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
if (adj->upper - adj->page_size < 0.8) if (adj->upper - adj->page_size < 0.8)
{ {
if (m_vScrollbarVisible) if (m_vScrollbarVisible)
{ {
gtk_widget_hide( m_vScrollbar ); gtk_widget_hide( m_vScrollbar );
m_vScrollbarVisible = FALSE; m_vScrollbarVisible = FALSE;
} }
} }
else else
{ {
if (!m_vScrollbarVisible) if (!m_vScrollbarVisible)
{ {
gtk_widget_show( m_vScrollbar ); gtk_widget_show( m_vScrollbar );
m_vScrollbarVisible = TRUE; m_vScrollbarVisible = TRUE;
} }
} }
} }
@@ -321,8 +321,8 @@ bool wxTextCtrl::LoadFile( const wxString &file )
return FALSE; return FALSE;
} }
if (fread (text, sizeof (char), len, fp) != (size_t) len) if (fread (text, sizeof (char), len, fp) != (size_t) len)
{ {
} }
fclose (fp); fclose (fp);
text[len] = 0; text[len] = 0;
@@ -372,13 +372,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
} }
if (fwrite (text, sizeof (char), len, fp) != (size_t) len) if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
{ {
// Did not write whole file // Did not write whole file
} }
// Make sure newline terminates the file // Make sure newline terminates the file
if (text[len - 1] != '\n') if (text[len - 1] != '\n')
fputc ('\n', fp); fputc ('\n', fp);
fclose (fp); fclose (fp);
@@ -445,12 +445,12 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
for (int i = 0; i < pos; i++ ) for (int i = 0; i < pos; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
{ {
(*y)++; (*y)++;
*x=1; *x=1;
} }
else else
(*x)++; (*x)++;
} }
g_free( text ); g_free( text );
return 1; return 1;
@@ -459,11 +459,11 @@ long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
long wxTextCtrl::XYToPosition(long x, long y ) const long wxTextCtrl::XYToPosition(long x, long y ) const
{ {
if (!(m_windowStyle & wxTE_MULTILINE)) return 0; if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
long pos=0; long pos=0;
for( int i=1; i<y; i++ ) pos += GetLineLength(i); for( int i=1; i<y; i++ ) pos += GetLineLength(i);
pos +=x-1; // Pos start with 0 pos +=x-1; // Pos start with 0
return pos; return pos;
} }
@@ -485,17 +485,17 @@ int wxTextCtrl::GetNumberOfLines() const
{ {
int currentLine = 0; int currentLine = 0;
for (int i = 0; i < len; i++ ) for (int i = 0; i < len; i++ )
{ {
if (text[i] == '\n') if (text[i] == '\n')
currentLine++; currentLine++;
} }
g_free( text ); g_free( text );
return currentLine; return currentLine;
} }
else else
{ {
return 0; return 0;
} }
} }
else else
{ {
@@ -518,13 +518,7 @@ void wxTextCtrl::SetInsertionPointEnd()
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
int pos = 0; SetInsertionPoint(-1);
if (m_windowStyle & wxTE_MULTILINE)
pos = gtk_text_get_length( GTK_TEXT(m_text) );
else
pos = GTK_ENTRY(m_text)->text_length;
SetInsertionPoint((pos-1)>0 ? (pos-1):0);
} }
void wxTextCtrl::SetEditable( bool editable ) void wxTextCtrl::SetEditable( bool editable )
@@ -565,7 +559,7 @@ long wxTextCtrl::GetLastPosition() const
pos = gtk_text_get_length( GTK_TEXT(m_text) ); pos = gtk_text_get_length( GTK_TEXT(m_text) );
else else
pos = GTK_ENTRY(m_text)->text_length; pos = GTK_ENTRY(m_text)->text_length;
return (long)pos-1; return (long)pos-1;
} }
@@ -627,7 +621,7 @@ void wxTextCtrl::Clear()
void wxTextCtrl::OnChar( wxKeyEvent &key_event ) void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{ {
wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
{ {
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
@@ -751,13 +745,13 @@ void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
wxControl::SetBackgroundColour( colour ); wxControl::SetBackgroundColour( colour );
wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() && if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() && sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue()) sysbg.Blue() == colour.Blue())
{ {
return; return;
} }
if (!m_backgroundColour.Ok()) return; if (!m_backgroundColour.Ok()) return;
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
@@ -774,7 +768,7 @@ void wxTextCtrl::ApplyWidgetStyle()
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
// how ? // how ?
} }
else else
{ {
SetWidgetStyle(); SetWidgetStyle();