// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
+#include "wx/wxprec.h"
#if wxUSE_CHOICE
#include "wx/choice.h"
#include "wx/arrstr.h"
-#include "wx/gtk/private.h"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+// FIXME: We use GtkOptionMenu which has been deprecated since GTK+ 2.3.0 in
+// favour of GtkComboBox.
+// Later use GtkComboBox if GTK+ runtime version is new enough.
+#include <gtk/gtkversion.h>
+#if defined(GTK_DISABLE_DEPRECATED) && GTK_CHECK_VERSION(2,3,0)
+#undef GTK_DISABLE_DEPRECATED
+#endif
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// data
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]);
}
return GtkAddHelper(menu, GetCount(), item);
}
-int wxChoice::DoInsert( const wxString &item, int pos )
+int wxChoice::DoInsert(const wxString &item, unsigned int pos)
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
- wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+ wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
if (pos == GetCount())
return DoAppend(item);
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
// 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++;
return GtkAddHelper(menu, pos, item);
}
-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 )
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
node->SetData( (wxObject*) clientData );
}
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
m_selection_hack = wxNOT_FOUND;
}
-void wxChoice::Delete( int n )
+void wxChoice::Delete(unsigned int n)
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
+ wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
// 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") );
+ unsigned int i;
+ const unsigned int count = GetCount();
// 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;
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
- label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid 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)
{
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
- label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid 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)
{
if (bin->child)
label = GTK_LABEL(bin->child);
if (!label)
- label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+ label = GTK_LABEL(GTK_BIN(m_widget)->child);
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid 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 ((n >= 0) && ((unsigned int)n < GetCount()))
{
// a valid selection has been made
m_selection_hack = n;
if (bin->child)
label = bin->child;
if (!label)
- label = BUTTON_CHILD(m_widget);
+ label = GTK_BIN(m_widget)->child;
gtk_widget_modify_style( label, style );
}
}
-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 ) );
- size_t index;
+ unsigned int index;
if ( m_strings )
{
// sorted control, need to insert at the correct index
index = m_strings->Add(item);
- gtk_menu_insert( GTK_MENU(menu), menu_item, index );
+ gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, index );
if ( index )
{
// 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 );
+ gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
m_clientList.Append( (wxObject*) NULL );
index = m_clientList.GetCount() - 1;
}
else
{
- gtk_menu_insert( GTK_MENU(menu), menu_item, pos );
+ gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
m_clientList.Insert( pos, (wxObject*) NULL );
index = pos;
}
// it has to change. Adapted from Matt Ownby.
InvalidateBestSize();
- gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ g_signal_connect_after (menu_item, "activate",
+ G_CALLBACK (gtk_choice_clicked_callback),
+ this);
gtk_widget_show( menu_item );
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 );
if ( width > ret.x )
projects / wxWidgets.git / blobdiff