No changes, just get rid of some wxT()s in wxString unit test.

[wxWidgets.git] / src / gtk / choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 28832ef3e4f0d4d34c4b7fc2f4cf5cdd6cb18da2..bbfa2480bb8544d25ac8b9727b3c76db4ce1cd10 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -30,7 +30,7 @@ extern "C" {
 static void
 gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
-    choice->SendSelectionChangedEvent(wxEVT_COMMAND_CHOICE_SELECTED);
+    choice->SendSelectionChangedEvent(wxEVT_CHOICE);
 }
 
 }
@@ -101,22 +101,6 @@ wxChoice::~wxChoice()
     delete m_strings;
 }
 
-void wxChoice::SendSelectionChangedEvent(wxEventType evt_type)
-{
-    if (GetSelection() == -1)
-        return;
-
-    wxCommandEvent event( evt_type, GetId() );
-
-    int n = GetSelection();
-    event.SetInt( n );
-    event.SetString( GetStringSelection() );
-    event.SetEventObject( this );
-    InitCommandEventWithItems( event, n );
-
-    HandleWindowEvent( event );
-}
-
 void wxChoice::GTKInsertComboBoxTextItem( unsigned int n, const wxString& text )
 {
 #ifdef __WXGTK3__
@@ -197,8 +181,12 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
     GtkListStore* store = GTK_LIST_STORE(model);
     GtkTreeIter iter;
-    gtk_tree_model_iter_nth_child( model, &iter,
-                                   NULL, (gint) n );
+    if ( !gtk_tree_model_iter_nth_child(model, &iter, NULL, n) )
+    {
+        // This is really not supposed to happen for a valid index.
+        wxFAIL_MSG(wxS("Item unexpectedly not found."));
+        return;
+    }
     gtk_list_store_remove( store, &iter );
 
     m_clientData.RemoveAt( n );
@@ -324,7 +312,6 @@ int wxChoice::GetColumns() const
     return intval;
 }
 
-
 void wxChoice::GTKDisableEvents()
 {
     g_signal_handlers_block_by_func(m_widget,
@@ -337,7 +324,6 @@ void wxChoice::GTKEnableEvents()
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 
-
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
     return gtk_widget_get_window(m_widget);
@@ -348,8 +334,38 @@ wxSize wxChoice::DoGetBestSize() const
     // Get the height of the control from GTK+ itself, but use our own version
     // to compute the width large enough to show all our strings as GTK+
     // doesn't seem to take the control contents into account.
-    return wxSize(wxChoiceBase::DoGetBestSize().x + 40,
-                  wxControl::DoGetBestSize().y);
+    return GetSizeFromTextSize(wxChoiceBase::DoGetBestSize().x);
+}
+
+wxSize wxChoice::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxASSERT_MSG( m_widget, wxS("GetSizeFromTextSize called before creation") );
+
+    // a GtkEntry for wxComboBox and a GtkCellView for wxChoice
+    GtkWidget* childPart = gtk_bin_get_child(GTK_BIN(m_widget));
+
+    // Set a as small as possible size for the control, so preferred sizes
+    // return "natural" sizes, not taking into account the previous ones (which
+    // seems to be GTK+3 behaviour)
+    gtk_widget_set_size_request(m_widget, 0, 0);
+
+    // We are interested in the difference of sizes between the whole contol
+    // and its child part. I.e. arrow, separators, etc.
+    GtkRequisition req;
+    gtk_widget_get_preferred_size(childPart, NULL, &req);
+    wxSize totalS = GTKGetPreferredSize(m_widget);
+
+    wxSize tsize(xlen + totalS.x - req.width, totalS.y);
+
+    // For a wxChoice, not for wxComboBox, add some margins
+    if ( !GTK_IS_ENTRY(childPart) )
+        tsize.IncBy(5, 0);
+
+    // Perhaps the user wants something different from CharHeight
+    if ( ylen > 0 )
+        tsize.IncBy(0, ylen - GetCharHeight());
+
+    return tsize;
 }
 
 void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -358,13 +374,11 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
     GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
 }
 
-
 // static
 wxVisualAttributes
 wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new());
 }
 
-
 #endif // wxUSE_CHOICE || wxUSE_COMBOBOX