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

Use GTKXXX notation for some more wxGTK specific methods for consistency

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2010-05-30 17:45:40 +00:00
parent 0d373eac1d
commit dec7b5a808
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/combobox.h
View File

@@ -118,8 +118,8 @@ public:
void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event);
virtual void DisableEvents();
virtual void EnableEvents();
virtual void GTKDisableEvents();
virtual void GTKEnableEvents();
GtkWidget* GetConnectWidget();
static wxVisualAttributes

12
include/wx/gtk/listbox.h
View File

@@ -95,10 +95,10 @@ public:
bool m_hasCheckBoxes;
#endif // wxUSE_CHECKLISTBOX
struct _GtkTreeEntry* GtkGetEntry(unsigned pos) const;
struct _GtkTreeEntry* GTKGetEntry(unsigned pos) const;
void GtkDisableEvents();
void GtkEnableEvents();
void GTKDisableEvents();
void GTKEnableEvents();
protected:
virtual void DoClear();
@@ -119,13 +119,13 @@ protected:
virtual int DoListHitTest(const wxPoint& point) const;
// get the iterator for the given index, returns false if invalid
bool GtkGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const;
bool GTKGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const;
// get the index for the given iterator, return wxNOT_FOUND on failure
int GtkGetIndexFor(_GtkTreeIter& iter) const;
int GTKGetIndexFor(_GtkTreeIter& iter) const;
// set the specified item
void GtkSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
void GTKSetItem(_GtkTreeIter& iter, const _GtkTreeEntry *entry);
// common part of DoSetFirstItem() and EnsureVisible()
void DoScrollToCell(int n, float alignY, float alignX);

4
src/gtk/combobox.cpp
View File

@@ -222,7 +222,7 @@ void wxComboBox::OnChar( wxKeyEvent &event )
event.Skip();
}
void wxComboBox::DisableEvents()
void wxComboBox::GTKDisableEvents()
{
if ( GetEntry() )
g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
@@ -234,7 +234,7 @@ void wxComboBox::DisableEvents()
(gpointer)gtkcombobox_popupshown_callback, this);
}
void wxComboBox::EnableEvents()
void wxComboBox::GTKEnableEvents()
{
if ( GetEntry() )
g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,

62
src/gtk/listbox.cpp
View File

@@ -79,7 +79,7 @@ gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview),
if (listbox->IsSelected(sel))
{
GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
GtkTreeEntry* entry = listbox->GTKGetEntry(sel);
if (entry)
{
@@ -141,7 +141,7 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
}
else
{
GtkTreeEntry* entry = listbox->GtkGetEntry( index );
GtkTreeEntry* entry = listbox->GTKGetEntry( index );
// indicate that this is a selection
event.SetExtraLong( 1 );
@@ -194,7 +194,7 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
event.SetEventObject( listbox );
GtkTreeEntry* entry = listbox->GtkGetEntry( index );
GtkTreeEntry* entry = listbox->GTKGetEntry( index );
// indicate that this is a selection
event.SetExtraLong( 1 );
@@ -487,7 +487,7 @@ wxListBox::~wxListBox()
Clear();
}
void wxListBox::GtkDisableEvents()
void wxListBox::GTKDisableEvents()
{
GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
@@ -495,7 +495,7 @@ void wxListBox::GtkDisableEvents()
(gpointer) gtk_listitem_changed_callback, this);
}
void wxListBox::GtkEnableEvents()
void wxListBox::GTKEnableEvents()
{
GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
@@ -531,7 +531,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
GtkTreeIter iter;
if ( pos != GetCount() )
{
wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND,
wxCHECK_MSG( GTKGetIteratorFor(pos, &iter), wxNOT_FOUND,
wxT("internal wxListBox error in insertion") );
pIter = &iter;
@@ -549,12 +549,12 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
GtkTreeIter itercur;
gtk_list_store_insert_before(m_liststore, &itercur, pIter);
GtkSetItem(itercur, entry);
GTKSetItem(itercur, entry);
g_object_unref (entry);
if (clientData)
AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type);
}
UpdateOldSelections();
@@ -570,13 +570,13 @@ void wxListBox::DoClear()
{
wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
GtkDisableEvents(); // just in case
GTKDisableEvents(); // just in case
InvalidateBestSize();
gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
GtkEnableEvents();
GTKEnableEvents();
}
void wxListBox::DoDeleteOneItem(unsigned int n)
@@ -585,23 +585,23 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
InvalidateBestSize();
GtkDisableEvents(); // just in case
GTKDisableEvents(); // just in case
GtkTreeIter iter;
wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") );
wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("wrong listbox index") );
// this returns false if iter is invalid (e.g. deleting item at end) but
// since we don't use iter, we ignore the return value
gtk_list_store_remove(m_liststore, &iter);
GtkEnableEvents();
GTKEnableEvents();
}
// ----------------------------------------------------------------------------
// helper functions for working with iterators
// ----------------------------------------------------------------------------
bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
bool wxListBox::GTKGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
{
if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
iter, NULL, pos) )
@@ -613,7 +613,7 @@ bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
return true;
}
int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
int wxListBox::GTKGetIndexFor(GtkTreeIter& iter) const
{
GtkTreePath *path =
gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
@@ -630,10 +630,10 @@ int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
}
// get GtkTreeEntry from position (note: you need to g_unref it if valid)
GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const
GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const
{
GtkTreeIter iter;
if ( !GtkGetIteratorFor(n, &iter) )
if ( !GTKGetIteratorFor(n, &iter) )
return NULL;
@@ -644,7 +644,7 @@ GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const
return entry;
}
void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
{
#if wxUSE_CHECKLISTBOX
if ( m_hasCheckBoxes )
@@ -670,7 +670,7 @@ void* wxListBox::DoGetItemClientData(unsigned int n) const
wxCHECK_MSG( IsValid(n), NULL,
wxT("Invalid index passed to GetItemClientData") );
GtkTreeEntry* entry = GtkGetEntry(n);
GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
void* userdata = gtk_tree_entry_get_userdata( entry );
@@ -683,7 +683,7 @@ void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
wxCHECK_RET( IsValid(n),
wxT("Invalid index passed to SetItemClientData") );
GtkTreeEntry* entry = GtkGetEntry(n);
GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_RET(entry, wxT("could not get entry"));
gtk_tree_entry_set_userdata( entry, clientData );
@@ -699,7 +699,7 @@ void wxListBox::SetString(unsigned int n, const wxString& label)
wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
GtkTreeEntry* entry = GtkGetEntry(n);
GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_RET( entry, wxT("wrong listbox index") );
// update the item itself
@@ -707,18 +707,18 @@ void wxListBox::SetString(unsigned int n, const wxString& label)
// and update the model which will refresh the tree too
GtkTreeIter iter;
wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("failed to get iterator") );
wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("failed to get iterator") );
// FIXME: this resets the checked status of a wxCheckListBox item
GtkSetItem(iter, entry);
GTKSetItem(iter, entry);
}
wxString wxListBox::GetString(unsigned int n) const
{
wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
GtkTreeEntry* entry = GtkGetEntry(n);
GtkTreeEntry* entry = GTKGetEntry(n);
wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
@@ -769,7 +769,7 @@ int wxListBox::GetSelection() const
if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
return wxNOT_FOUND;
return GtkGetIndexFor(iter);
return GTKGetIndexFor(iter);
}
int wxListBox::GetSelections( wxArrayInt& aSelections ) const
@@ -803,7 +803,7 @@ bool wxListBox::IsSelected( int n ) const
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
GtkTreeIter iter;
wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") );
wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") );
return gtk_tree_selection_iter_is_selected(selection, &iter);
}
@@ -812,7 +812,7 @@ void wxListBox::DoSetSelection( int n, bool select )
{
wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
GtkDisableEvents();
GTKDisableEvents();
GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
@@ -820,7 +820,7 @@ void wxListBox::DoSetSelection( int n, bool select )
if ( n == wxNOT_FOUND )
{
gtk_tree_selection_unselect_all(selection);
GtkEnableEvents();
GTKEnableEvents();
return;
}
@@ -828,7 +828,7 @@ void wxListBox::DoSetSelection( int n, bool select )
GtkTreeIter iter;
wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("Invalid index") );
if (select)
gtk_tree_selection_select_iter(selection, &iter);
@@ -842,7 +842,7 @@ void wxListBox::DoSetSelection( int n, bool select )
gtk_tree_path_free(path);
GtkEnableEvents();
GTKEnableEvents();
}
void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
@@ -855,7 +855,7 @@ void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
return;
GtkTreeIter iter;
if ( !GtkGetIteratorFor(n, &iter) )
if ( !GTKGetIteratorFor(n, &iter) )
return;
GtkTreePath* path = gtk_tree_model_get_path(