Fix crash in wxDataViewProgressRenderer in non-Unicode build.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index af58e5c2ce8b0a4044751d8ac95b0352822f1533..d9fc4408c7f292f6e709a0f4f49465532a3b23ce 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -38,11 +38,9 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-

 void wxChoice::Init()
 {
 void wxChoice::Init()
 {

-    m_strings = (wxSortedArrayString *)NULL;
+    m_strings = NULL;

     m_stringCellIndex = 0;
 }
 
     m_stringCellIndex = 0;
 }
 


@@ -75,10 +73,11 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     {
         // if our m_strings != NULL, Append() will check for it and insert
         // items in the correct order
     {
         // if our m_strings != NULL, Append() will check for it and insert
         // items in the correct order

-        m_strings = new wxSortedArrayString;
+        m_strings = new wxGtkCollatedArrayString;

     }
 
     m_widget = gtk_combo_box_new_text();
     }
 
     m_widget = gtk_combo_box_new_text();

+    g_object_ref(m_widget);

 
     Append(n, choices);
 
 
     Append(n, choices);
 


@@ -128,7 +127,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
 
     wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid control") );
 
     wxASSERT_MSG( !IsSorted() || (pos == GetCount()),

-                 _T("In a sorted choice data could only be appended"));
+                 wxT("In a sorted choice data could only be appended"));

 
     const int count = items.GetCount();
 
 
     const int count = items.GetCount();
 


@@ -139,7 +138,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
         n = pos + i;
         // If sorted, use this wxSortedArrayStrings to determine
         // the right insertion point
         n = pos + i;
         // If sorted, use this wxSortedArrayStrings to determine
         // the right insertion point

-        if(m_strings)
+        if (m_strings)

             n = m_strings->Add(items[i]);
 
         GTKInsertComboBoxTextItem( n, items[i] );
             n = m_strings->Add(items[i]);
 
         GTKInsertComboBoxTextItem( n, items[i] );


@@ -167,7 +166,7 @@ void wxChoice::DoClear()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 

-    DisableEvents();
+    GTKDisableEvents();

 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );


@@ -178,7 +177,7 @@ void wxChoice::DoClear()
     if (m_strings)
         m_strings->Clear();
 
     if (m_strings)
         m_strings->Clear();
 

-    EnableEvents();
+    GTKEnableEvents();

 
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }


@@ -186,7 +185,7 @@ void wxChoice::DoClear()
 void wxChoice::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 void wxChoice::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );

-    wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxChoice::Delete") );

 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );


@@ -298,21 +297,35 @@ void wxChoice::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 

-    DisableEvents();
+    GTKDisableEvents();

 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     gtk_combo_box_set_active( combobox, n );
 
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     gtk_combo_box_set_active( combobox, n );
 

-    EnableEvents();
+    GTKEnableEvents();
+}
+
+void wxChoice::SetColumns(int n)
+{
+    gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(m_widget), n);
+}
+
+int wxChoice::GetColumns() const
+{
+    // gtk_combo_box_get_wrap_width() was added in gtk 2.6
+    gint intval;
+    g_object_get(G_OBJECT(m_widget), "wrap-width", &intval, NULL);
+    return intval;

 }
 
 }
 

-void wxChoice::DisableEvents()
+
+void wxChoice::GTKDisableEvents()

 {
     g_signal_handlers_block_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 
 {
     g_signal_handlers_block_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 

-void wxChoice::EnableEvents()
+void wxChoice::GTKEnableEvents()

 {
     g_signal_handlers_unblock_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 {
     g_signal_handlers_unblock_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);


@@ -321,7 +334,7 @@ void wxChoice::EnableEvents()
 
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {

-    return m_widget->window;
+    return gtk_widget_get_window(m_widget);

 }
 
 // Notice that this method shouldn't be necessary, because GTK calculates
 }
 
 // Notice that this method shouldn't be necessary, because GTK calculates


@@ -336,7 +349,7 @@ wxSize wxChoice::DoGetBestSize() const
     // in the combobox
     if ( m_widget )
     {
     // in the combobox
     if ( m_widget )
     {

-        ret.x = 60;  // start with something "sensible"
+        ret.x = GetCount() > 0 ? 0 : 60;  // start with something "sensible"

         int width;
         unsigned int count = GetCount();
         for ( unsigned int n = 0; n < count; n++ )
         int width;
         unsigned int count = GetCount();
         for ( unsigned int n = 0; n < count; n++ )


@@ -355,6 +368,13 @@ wxSize wxChoice::DoGetBestSize() const
     return ret;
 }
 
     return ret;
 }
 

+void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+}
+
+

 // static
 wxVisualAttributes
 wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))