// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#if wxUSE_CHOICE
#include "wx/choice.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/arrstr.h"
+#endif
#include "wx/gtk1/private.h"
choice->m_selection_hack = selection;
- wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
+ wxCommandEvent event(wxEVT_CHOICE, choice->GetId() );
int n = choice->GetSelection();
event.SetInt( n );
else if ( choice->HasClientUntypedData() )
event.SetClientData( choice->GetClientData(n) );
- choice->GetEventHandler()->ProcessEvent(event);
+ choice->HandleWindowEvent(event);
}
}
// wxChoice
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
-
wxChoice::wxChoice()
{
- m_strings = (wxSortedArrayString *)NULL;
+ m_strings = NULL;
}
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
if ( style & wxCB_SORT )
{
- // if our m_strings != NULL, DoAppend() will check for it and insert
+ // if our m_strings != NULL, Append() will check for it and insert
// items in the correct order
m_strings = new wxSortedArrayString;
}
GtkWidget *menu = gtk_menu_new();
- for (int i = 0; i < n; i++)
+ for (unsigned int i = 0; i < (unsigned int)n; i++)
{
GtkAddHelper(menu, i, choices[i]);
}
m_parent->DoAddChild( this );
PostCreation(size);
- SetBestSize(size); // need this too because this is a wxControlWithItems
+ SetInitialSize(size); // need this too because this is a wxControlWithItems
return true;
}
delete m_strings;
}
-int wxChoice::DoAppend( const wxString &item )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
- GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+ const unsigned int count = items.GetCount();
- return GtkAddHelper(menu, GetCount(), item);
-}
-
-int wxChoice::DoInsert( const wxString &item, int pos )
-{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
- wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+ GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- if (pos == GetCount())
- return DoAppend(item);
+ for ( unsigned int i = 0; i < count; ++i, ++pos )
+ {
+ int n = GtkAddHelper(menu, pos, items[i]);
+ if ( n == wxNOT_FOUND )
+ return n;
- GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+ AssignNewItemClientData(n, clientData, i, type);
+ }
// if the item to insert is at or before the selection, and the selection is valid
- if ((pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+ if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
{
- // move the selection forward one
- m_selection_hack++;
+ // move the selection forward
+ m_selection_hack += count;
}
- return GtkAddHelper(menu, pos, item);
+ return pos - 1;
}
-void wxChoice::DoSetItemClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
node->SetData( (wxObject*) clientData );
}
-void* wxChoice::DoGetItemClientData( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
return node->GetData();
}
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
-
- wxList::compatibility_iterator node = m_clientList.Item( n );
- wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
-
- // wxItemContainer already deletes data for us
-
- node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
- wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
-
- wxList::compatibility_iterator node = m_clientList.Item( n );
- wxCHECK_MSG( node, (wxClientData *)NULL,
- wxT("invalid index in wxChoice::DoGetItemClientObject") );
-
- return (wxClientData*) node->GetData();
-}
-
-void wxChoice::Clear()
+void wxChoice::DoClear()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
GtkWidget *menu = gtk_menu_new();
gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
- if ( HasClientObjectData() )
- {
- // destroy the data (due to Robert's idea of using wxList<wxObject>
- // and not wxList<wxClientData> we can't just say
- // m_clientList.DeleteContents(true) - this would crash!
- wxList::compatibility_iterator node = m_clientList.GetFirst();
- while ( node )
- {
- delete (wxClientData *)node->GetData();
- node = node->GetNext();
- }
- }
m_clientList.Clear();
if ( m_strings )
m_selection_hack = wxNOT_FOUND;
}
-void wxChoice::Delete( int n )
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
- // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
- // in 2.0), hence this dumb implementation -- still better than nothing
- int i,
- count = GetCount();
-
- wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
+ wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );
// if the item to delete is before the selection, and the selection is valid
- if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
+ if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
{
// move the selection back one
m_selection_hack--;
}
- else if (n == m_selection_hack)
+ else if ((int)n == m_selection_hack)
{
// invalidate the selection
m_selection_hack = wxNOT_FOUND;
}
- const bool hasClientData = m_clientDataItemsType != wxClientData_None;
- const bool hasObjectData = m_clientDataItemsType == wxClientData_Object;
+ // VZ: apparently GTK+ doesn't have a built-in function to do it (not even
+ // in 2.0), hence this dumb implementation -- still better than nothing
+ const unsigned int count = GetCount();
wxList::compatibility_iterator node = m_clientList.GetFirst();
wxArrayString items;
wxArrayPtrVoid itemsData;
items.Alloc(count);
- for ( i = 0; i < count; i++ )
+ for ( unsigned i = 0; i < count; i++, node = node->GetNext() )
{
if ( i != n )
{
items.Add(GetString(i));
- if ( hasClientData )
- {
- // also save the client data
- itemsData.Add(node->GetData());
- }
+ itemsData.Add(node->GetData());
}
- else // need to delete the client object too
- {
- if ( hasObjectData )
- {
- delete (wxClientData *)node->GetData();
- }
- }
-
- if ( hasClientData )
- {
- node = node->GetNext();
- }
- }
-
- if ( hasObjectData )
- {
- // prevent Clear() from destroying all client data
- m_clientDataItemsType = wxClientData_None;
}
- Clear();
-
- for ( i = 0; i < count - 1; i++ )
- {
- Append(items[i]);
+ wxChoice::DoClear();
- if ( hasObjectData )
- SetClientObject(i, (wxClientData *)itemsData[i]);
- else if ( hasClientData )
- SetClientData(i, itemsData[i]);
- }
+ void ** const data = &itemsData[0];
+ if ( HasClientObjectData() )
+ Append(items, reinterpret_cast<wxClientData **>(data));
+ else
+ Append(items, data);
}
int wxChoice::FindString( const wxString &string, bool bCase ) const
while (child)
{
GtkBin *bin = GTK_BIN( child->data );
- GtkLabel *label = (GtkLabel *) NULL;
+ GtkLabel *label = NULL;
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
}
-void wxChoice::SetString( int n, const wxString& str )
+void wxChoice::SetString(unsigned int n, const wxString& str )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
GtkBin *bin = GTK_BIN( child->data );
if (count == n)
{
- GtkLabel *label = (GtkLabel *) NULL;
+ GtkLabel *label = NULL;
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
}
}
-wxString wxChoice::GetString( int n ) const
+wxString wxChoice::GetString(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, wxEmptyString, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
GtkBin *bin = GTK_BIN( child->data );
if (count == n)
{
- GtkLabel *label = (GtkLabel *) NULL;
+ GtkLabel *label = NULL;
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
return wxEmptyString;
}
-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ unsigned int count = 0;
GList *child = menu_shell->children;
while (child)
{
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
// set the local selection variable manually
- if ((n >= 0) && (n < GetCount()))
+ if (IsValid((unsigned int)n))
{
// a valid selection has been made
m_selection_hack = n;
gtk_widget_modify_style( GTK_WIDGET( child->data ), style );
GtkBin *bin = GTK_BIN( child->data );
- GtkWidget *label = (GtkWidget *) NULL;
+ GtkWidget *label = NULL;
if (bin->child)
label = bin->child;
if (!label)
}
}
-int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
+int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
{
- wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
+ wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index"));
GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
if ( index )
{
m_clientList.Insert( m_clientList.Item(index - 1),
- (wxObject*) NULL );
+ NULL );
}
else
{
- m_clientList.Insert( (wxObject*) NULL );
+ m_clientList.Insert( NULL );
}
}
else
// if we're called from ctor (and GtkMenuShell is still NULL)
// normal control, just append
- if (pos == (int)m_clientList.GetCount())
+ if (pos == m_clientList.GetCount())
{
gtk_menu_append( GTK_MENU(menu), menu_item );
- m_clientList.Append( (wxObject*) NULL );
+ m_clientList.Append( NULL );
index = m_clientList.GetCount() - 1;
}
else
{
gtk_menu_insert( GTK_MENU(menu), menu_item, pos );
- m_clientList.Insert( pos, (wxObject*) NULL );
+ m_clientList.Insert( pos, NULL );
index = pos;
}
}
if ( m_widget )
{
int width;
- size_t count = GetCount();
- for ( size_t n = 0; n < count; n++ )
+ unsigned int count = GetCount();
+ for ( unsigned int n = 0; n < count; n++ )
{
- GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
+ GetTextExtent(GetString(n), &width, NULL, NULL, NULL );
if ( width > ret.x )
ret.x = width;
}
projects / wxWidgets.git / blobdiff