/////////////////////////////////////////////////////////////////////////////
-// Name: choice.cpp
+// Name: src/gtk/choice.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "choice.h"
-#endif
-
-#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
// "activate"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
{
if (g_isIdle)
if (g_blockEventsOnDrag) return;
+ int selection = wxNOT_FOUND;
+
+ selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
+
+ choice->m_selection_hack = selection;
+
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
int n = choice->GetSelection();
choice->GetEventHandler()->ProcessEvent(event);
}
+}
//-----------------------------------------------------------------------------
// wxChoice
int n, const wxString choices[],
long style, const wxValidator& validator, const wxString &name )
{
- m_needParent = TRUE;
+ m_needParent = true;
#if (GTK_MINOR_VERSION > 0)
- m_acceptsFocus = TRUE;
+ m_acceptsFocus = true;
#endif
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxChoice creation failed") );
- return FALSE;
+ return false;
}
m_widget = gtk_option_menu_new();
m_strings = new wxSortedArrayString;
}
+ // begin with no selection
+ m_selection_hack = wxNOT_FOUND;
+
GtkWidget *menu = gtk_menu_new();
- for (int i = 0; i < n; i++)
+ for (size_t i = 0; i < (size_t)n; i++)
{
GtkAddHelper(menu, i, choices[i]);
}
PostCreation(size);
SetBestSize(size); // need this too because this is a wxControlWithItems
- return TRUE;
+ return true;
}
wxChoice::~wxChoice()
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"));
+ wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
- if (pos == GetCount())
+ if ((size_t)pos == GetCount())
return DoAppend(item);
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
- return GtkAddHelper(menu, pos, item);
+ // 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))
+ {
+ // move the selection forward one
+ m_selection_hack++;
+ }
+
+ return GtkAddHelper(menu, (size_t)pos, item);
}
void wxChoice::DoSetItemClientData( int n, void* clientData )
{
// 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!
+ // m_clientList.DeleteContents(true) - this would crash!
wxList::compatibility_iterator node = m_clientList.GetFirst();
while ( node )
{
if ( m_strings )
m_strings->Clear();
+
+ // begin with no selection
+ m_selection_hack = wxNOT_FOUND;
}
void wxChoice::Delete( 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();
+ size_t i;
+ const size_t count = GetCount();
- wxCHECK_RET( n >= 0 && n < count, _T("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))
+ {
+ // move the selection back one
+ m_selection_hack--;
+ }
+ else if (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;
items.Alloc(count);
for ( i = 0; i < count; i++ )
{
- if ( i != n )
+ if ( i != (size_t)n )
{
items.Add(GetString(i));
if ( hasClientData )
}
}
-int wxChoice::FindString( const wxString &string ) const
+int wxChoice::FindString( const wxString &string, bool bCase ) const
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
// If you read this code once and you think you understand
// it, then you are very wrong. Robert Roebling.
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") );
-#ifdef __WXGTK20__
wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else
- wxString tmp( label->label );
-#endif
- if (string == tmp)
+ if (string.IsSameAs( tmp, bCase ))
return count;
child = child->next;
count++;
}
- return -1;
+ return wxNOT_FOUND;
}
int wxChoice::GetSelection() const
{
- wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
-
-#ifdef __WXGTK20__
-
- return gtk_option_menu_get_history( GTK_OPTION_MENU(m_widget) );
-
-#else
- GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- int count = 0;
+ wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, wxT("invalid choice") );
- GList *child = menu_shell->children;
- while (child)
- {
- GtkBin *bin = GTK_BIN( child->data );
- if (!bin->child) return count;
- child = child->next;
- count++;
- }
+ return m_selection_hack;
- return -1;
-#endif
}
void wxChoice::SetString( int n, const wxString& str )
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") );
- gtk_label_set_text( label, wxGTK_CONV( str ) );
-
+ gtk_label_set_text( label, wxGTK_CONV( str ) );
+
return;
}
child = child->next;
wxString wxChoice::GetString( int n ) const
{
- wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
+ 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;
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") );
-#ifdef __WXGTK20__
return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
-#else
- return wxString( label->label );
-#endif
}
child = child->next;
count++;
wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
- return wxT("");
+ return wxEmptyString;
}
-int wxChoice::GetCount() const
+size_t 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;
+ size_t count = 0;
GList *child = menu_shell->children;
while (child)
{
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
+
+ // set the local selection variable manually
+ if ((n >= 0) && (n < (int)GetCount()))
+ {
+ // a valid selection has been made
+ m_selection_hack = n;
+ }
+ else if ((n == wxNOT_FOUND) || (GetCount() == 0))
+ {
+ // invalidates the selection if there are no items
+ // or if it is specifically set to wxNOT_FOUND
+ m_selection_hack = wxNOT_FOUND;
+ }
+ else
+ {
+ // this selects the first item by default if the selection is out of bounds
+ m_selection_hack = 0;
+ }
}
-void wxChoice::ApplyWidgetStyle()
+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
{
- SetWidgetStyle();
-
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
- gtk_widget_set_style( m_widget, m_widgetStyle );
- gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+ gtk_widget_modify_style( m_widget, style );
+ gtk_widget_modify_style( GTK_WIDGET( menu_shell ), style );
GList *child = menu_shell->children;
while (child)
{
- gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+ gtk_widget_modify_style( GTK_WIDGET( child->data ), style );
GtkBin *bin = GTK_BIN( child->data );
GtkWidget *label = (GtkWidget *) NULL;
if (bin->child)
label = bin->child;
if (!label)
- label = BUTTON_CHILD(m_widget);
+ label = GTK_BIN(m_widget)->child;
- gtk_widget_set_style( label, m_widgetStyle );
+ gtk_widget_modify_style( label, style );
child = child->next;
}
}
-int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
+int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
{
- wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
+ wxCHECK_MSG((pos>=0) && (pos<=m_clientList.GetCount()), -1, wxT("invalid index"));
GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
// 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 );
- m_clientList.Append( (wxObject*) NULL );
- index = m_clientList.GetCount() - 1;
+ 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;
}
gtk_widget_realize( menu_item );
gtk_widget_realize( GTK_BIN(menu_item)->child );
- if (m_widgetStyle) ApplyWidgetStyle();
+ ApplyWidgetStyle();
}
- gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
- GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+ // The best size of a wxChoice should probably
+ // be changed everytime the control has been
+ // changed, but at least after adding an item
+ // it has to change. Adapted from Matt Ownby.
+ InvalidateBestSize();
+
+ g_signal_connect_after (menu_item, "activate",
+ G_CALLBACK (gtk_choice_clicked_callback),
+ this);
gtk_widget_show( menu_item );
if ( ret.x < 80 )
ret.x = 80;
- ret.y = 16 + GetCharHeight();
+ // If this request_size is called with no entries then
+ // the returned height is wrong. Give it a reasonable
+ // default value.
+ if (ret.y <= 18)
+ ret.y = 8 + GetCharHeight();
+ CacheBestSize(ret);
return ret;
}
bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
{
-#ifdef __WXGTK20__
return GTK_BUTTON(m_widget)->event_window;
-#else
- return (window == m_widget->window);
-#endif
+}
+
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new);
}
#endif // wxUSE_CHOICE
-
projects / wxWidgets.git / blobdiff