/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "choice.h"
#endif
#if wxUSE_CHOICE
#include "wx/choice.h"
+#include "wx/arrstr.h"
#include "wx/gtk/private.h"
if (g_blockEventsOnDrag) return;
+ int selection = wxNOT_FOUND;
+
+#ifdef __WXGTK20__
+ selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
+#else
+ GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) );
+ int count = 0;
+
+ GList *child = menu_shell->children;
+ while (child)
+ {
+ GtkBin *bin = GTK_BIN( child->data );
+ if (!bin->child)
+ {
+ selection = count;
+ break;
+ }
+ child = child->next;
+ count++;
+ }
+#endif
+ choice->m_selection_hack = selection;
+
wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
int n = choice->GetSelection();
m_strings = (wxSortedArrayString *)NULL;
}
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+ const wxPoint &pos, const wxSize &size,
+ const wxArrayString& choices,
+ long style, const wxValidator& validator,
+ const wxString &name )
+{
+ wxCArrayString chs(choices);
+
+ return Create( parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+ style, validator, name );
+}
+
bool wxChoice::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
int n, const wxString choices[],
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++)
m_parent->DoAddChild( this );
- PostCreation();
-
- SetFont( parent->GetFont() );
-
- SetBestSize(size);
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
-
- Show( TRUE );
+ PostCreation(size);
+ SetBestSize(size); // need this too because this is a wxControlWithItems
return TRUE;
}
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))
+ {
+ // move the selection forward one
+ m_selection_hack++;
+ }
+
return GtkAddHelper(menu, pos, item);
}
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") );
// VZ: apparently GTK+ doesn't have a built-in function to do it (not even
- // in 2.0), hence this dump implementation - still better than nothing
+ // 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") );
+ // 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;
+
+ wxList::compatibility_iterator node = m_clientList.GetFirst();
+
wxArrayString items;
+ wxArrayPtrVoid itemsData;
items.Alloc(count);
for ( i = 0; i < count; i++ )
{
if ( i != n )
+ {
items.Add(GetString(i));
+ if ( hasClientData )
+ {
+ // also save the client data
+ 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]);
+
+ if ( hasObjectData )
+ SetClientObject(i, (wxClientData *)itemsData[i]);
+ else if ( hasClientData )
+ SetClientData(i, itemsData[i]);
}
}
label = GTK_LABEL( BUTTON_CHILD(m_widget) );
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
-
+
#ifdef __WXGTK20__
wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
#else
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
+ return m_selection_hack;
+
+}
+
+void wxChoice::SetString( 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;
-
GList *child = menu_shell->children;
while (child)
{
GtkBin *bin = GTK_BIN( child->data );
- if (!bin->child) return count;
+ if (count == n)
+ {
+ GtkLabel *label = (GtkLabel *) NULL;
+ if (bin->child)
+ label = GTK_LABEL(bin->child);
+ if (!label)
+ label = GTK_LABEL( BUTTON_CHILD(m_widget) );
+
+ wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
+
+ gtk_label_set_text( label, wxGTK_CONV( str ) );
+
+ return;
+ }
child = child->next;
count++;
}
-
- return -1;
-#endif
-}
-
-void wxChoice::SetString( int WXUNUSED(n), const wxString& WXUNUSED(string) )
-{
- wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
-
- wxFAIL_MSG(wxT("not implemented"));
}
wxString wxChoice::GetString( int n ) const
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 < 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 (!label)
label = BUTTON_CHILD(m_widget);
- gtk_widget_set_style( label, m_widgetStyle );
+ gtk_widget_modify_style( label, style );
child = child->next;
}
gtk_widget_realize( menu_item );
gtk_widget_realize( GTK_BIN(menu_item)->child );
- if (m_widgetStyle) ApplyWidgetStyle();
+ ApplyWidgetStyle();
}
+ // 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();
+
gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
size_t count = GetCount();
for ( size_t n = 0; n < count; n++ )
{
- GetTextExtent( GetString(n), &width, NULL, NULL, NULL, &m_font );
+ GetTextExtent( GetString(n), &width, NULL, NULL, NULL );
if ( width > ret.x )
ret.x = width;
}
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;
}
#endif
}
+// static
+wxVisualAttributes
+wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_option_menu_new);
+}
+
#endif // wxUSE_CHOICE
projects / wxWidgets.git / blobdiff