OR extra style with existing value or some implementations will

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 60bbf8f50d257559cec9684145b0fcb4d8b4403a..f7950f67bfc11b12521d176521355ad21f0c6f79 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -19,6 +19,7 @@
 #if wxUSE_COMBOBOX
 
 #include "wx/settings.h"
 #if wxUSE_COMBOBOX
 
 #include "wx/settings.h"

+#include "wx/arrstr.h"

 #include "wx/intl.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
 #include "wx/intl.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED


@@ -102,6 +103,19 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_CHAR(wxComboBox::OnChar)
 END_EVENT_TABLE()
 
     EVT_CHAR(wxComboBox::OnChar)
 END_EVENT_TABLE()
 

+bool wxComboBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& value,
+                         const wxPoint& pos, const wxSize& size,
+                         const wxArrayString& choices,
+                         long style, const wxValidator& validator,
+                         const wxString& name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+

 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],
 bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxPoint& pos, const wxSize& size,
                          int n, const wxString choices[],


@@ -157,7 +171,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
     m_focusWidget = combo->entry;
 
 
     m_focusWidget = combo->entry;
 

-    PostCreation();
+    PostCreation(size);

 
     ConnectWidget( combo->button );
 
 
     ConnectWidget( combo->button );
 


@@ -174,27 +188,12 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(combo->list), "select-child",
       GTK_SIGNAL_FUNC(gtk_combo_select_child_callback), (gpointer)this );
 

-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if (new_size.y > size_best.y)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-    {
-        SetSize( new_size.x, new_size.y );
-
-        // This is required for tool bar support
-        gtk_widget_set_usize( m_widget, new_size.x, new_size.y );
-    }
-
-    SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-    SetForegroundColour( parent->GetForegroundColour() );
-
-    Show( TRUE );
+    SetBestSize(size); // need this too because this is a wxControlWithItems

 
 

+    // This is required for tool bar support
+    wxSize setsize = GetSize();
+    gtk_widget_set_usize( m_widget, setsize.x, setsize.y );
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -223,7 +222,7 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
     gtk_widget_grab_focus( m_focusWidget );
 }
 

-int wxComboBox::AppendCommon( const wxString &item )
+int wxComboBox::DoAppend( const wxString &item )

 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 


@@ -245,36 +244,19 @@ int wxComboBox::AppendCommon( const wxString &item )
 
     gtk_widget_show( list_item );
 
 
     gtk_widget_show( list_item );
 

-    EnableEvents();
-
-    return GetCount() - 1;
-}
+    const int count = GetCount();

 
 

-int wxComboBox::Append( const wxString &item )
-{
+    if ( (int)m_clientDataList.GetCount() < count )

     m_clientDataList.Append( (wxObject*) NULL );
     m_clientDataList.Append( (wxObject*) NULL );

+    if ( (int)m_clientObjectList.GetCount() < count )

     m_clientObjectList.Append( (wxObject*) NULL );
 
     m_clientObjectList.Append( (wxObject*) NULL );
 

-    return AppendCommon( item );
-}
-
-int wxComboBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*)NULL );
-
-    return AppendCommon( item );
-}
-
-int wxComboBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) clientData );
+    EnableEvents();

 
 

-    return AppendCommon( item );
+    return count - 1;

 }
 
 }
 

-int wxComboBox::InsertCommon( const wxString &item, int pos )
+int wxComboBox::DoInsert( const wxString &item, int pos )

 {
     wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
                     wxT("can't insert into sorted list"));
 {
     wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
                     wxT("can't insert into sorted list"));


@@ -282,10 +264,10 @@ int wxComboBox::InsertCommon( const wxString &item, int pos )
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
     int count = GetCount();
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
     int count = GetCount();

+    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
+

     if (pos == count)
     if (pos == count)

-    {
-        return AppendCommon(item);
-    }
+        return Append(item);

 
     DisableEvents();
 
 
     DisableEvents();
 


@@ -308,60 +290,19 @@ int wxComboBox::InsertCommon( const wxString &item, int pos )
 
     gtk_widget_show( list_item );
 
 
     gtk_widget_show( list_item );
 

-    EnableEvents();
-
-    return pos;
-}
-
-int wxComboBox::Insert( const wxString &item, int pos )
-{
-    const int count = GetCount();
-    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
-
-    if (pos == count)
-    {
-        return Append(item);
-    }
+    count = GetCount();

 
 

+    if ( (int)m_clientDataList.GetCount() < count )

     m_clientDataList.Insert( pos, (wxObject*) NULL );
     m_clientDataList.Insert( pos, (wxObject*) NULL );

+    if ( (int)m_clientObjectList.GetCount() < count )

     m_clientObjectList.Insert( pos, (wxObject*) NULL );
 
     m_clientObjectList.Insert( pos, (wxObject*) NULL );
 

-    return InsertCommon( item, pos );
-}
-
-int wxComboBox::Insert( const wxString &item, int pos, void *clientData )
-{
-    int count = GetCount();
-    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
-
-    if (pos == count)
-    {
-        return Append(item, clientData);
-    }
-
-    m_clientDataList.Insert( pos, (wxObject*) clientData );
-    m_clientObjectList.Insert( pos, (wxObject*)NULL );
-
-    return InsertCommon( item, pos );
-}
-
-int wxComboBox::Insert( const wxString &item, int pos, wxClientData *clientData )
-{
-    int count = GetCount();
-    wxCHECK_MSG( (pos >= 0) && (pos <= count), -1, wxT("invalid index") );
-
-    if (pos == count)
-    {
-        return Append(item, clientData);
-    }
-
-    m_clientDataList.Insert( pos, (wxObject*) NULL );
-    m_clientObjectList.Insert( pos, (wxObject*) clientData );
+    EnableEvents();

 
 

-    return InsertCommon( item, pos );
+    return pos;

 }
 
 }
 

-void wxComboBox::SetClientData( int n, void* clientData )
+void wxComboBox::DoSetItemClientData( int n, void* clientData )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 


@@ -371,7 +312,7 @@ void wxComboBox::SetClientData( int n, void* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
     node->SetData( (wxObject*) clientData );
 }
 

-void* wxComboBox::GetClientData( int n ) const
+void* wxComboBox::DoGetItemClientData( int n ) const

 {
     wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
 


@@ -380,20 +321,19 @@ void* wxComboBox::GetClientData( int n ) const
     return node ? node->GetData() : NULL;
 }
 
     return node ? node->GetData() : NULL;
 }
 

-void wxComboBox::SetClientObject( int n, wxClientData* clientData )
+void wxComboBox::DoSetItemClientObject( int n, wxClientData* clientData )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (!node) return;
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
     wxList::compatibility_iterator node = m_clientObjectList.Item( n );
     if (!node) return;
 

-    wxClientData *cd = (wxClientData*) node->GetData();
-    if (cd) delete cd;
+    // wxItemContainer already deletes data for us

 
     node->SetData( (wxObject*) clientData );
 }
 
 
     node->SetData( (wxObject*) clientData );
 }
 

-wxClientData* wxComboBox::GetClientObject( int n ) const
+wxClientData* wxComboBox::DoGetItemClientObject( int n ) const

 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
 


@@ -409,7 +349,7 @@ void wxComboBox::Clear()
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;
     DisableEvents();
 
     GtkWidget *list = GTK_COMBO(m_widget)->list;

-    gtk_list_clear_items( GTK_LIST(list), 0, Number() );
+    gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );

 
     wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
     while (node)
 
     wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
     while (node)


@@ -479,7 +419,7 @@ void wxComboBox::SetString(int n, const wxString &text)
     }
 }
 
     }
 }
 

-int wxComboBox::FindString( const wxString &item )
+int wxComboBox::FindString( const wxString &item ) const

 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 


@@ -578,7 +518,7 @@ wxString wxComboBox::GetStringSelection() const
     return wxT("");
 }
 
     return wxT("");
 }
 

-int wxComboBox::Number() const
+int wxComboBox::GetCount() const

 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid combobox") );
 


@@ -604,13 +544,14 @@ void wxComboBox::SetSelection( int n )
     EnableEvents();
 }
 
     EnableEvents();
 }
 

-void wxComboBox::SetStringSelection( const wxString &string )
+bool wxComboBox::SetStringSelection( const wxString &string )

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid combobox") );

 
     int res = FindString( string );
 
     int res = FindString( string );

-    if (res == -1) return;
+    if (res == -1) return false;

     SetSelection( res );
     SetSelection( res );

+    return true;

 }
 
 wxString wxComboBox::GetValue() const
 }
 
 wxString wxComboBox::GetValue() const


@@ -668,17 +609,13 @@ void wxComboBox::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 

+    if ( pos == GetLastPosition() )
+        pos = -1;
+

     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
     gtk_entry_set_position( GTK_ENTRY(entry), (int)pos );
 }
 

-void wxComboBox::SetInsertionPointEnd()
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    SetInsertionPoint( -1 );
-}
-

 long wxComboBox::GetInsertionPoint() const
 {
     return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );
 long wxComboBox::GetInsertionPoint() const
 {
     return (long) GET_EDITABLE_POS( GTK_COMBO(m_widget)->entry );


@@ -708,14 +645,6 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
 #endif
 }
 
 #endif
 }
 

-void wxComboBox::Remove(long from, long to)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    GtkWidget *entry = GTK_COMBO(m_widget)->entry;
-    gtk_editable_delete_text( GTK_EDITABLE(entry), (gint)from, (gint)to );
-}
-

 void wxComboBox::SetSelection( long from, long to )
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;
 void wxComboBox::SetSelection( long from, long to )
 {
     GtkWidget *entry = GTK_COMBO(m_widget)->entry;


@@ -838,7 +767,7 @@ wxSize wxComboBox::DoGetBestSize() const
         size_t count = GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         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 ( width > ret.x )
                 ret.x = width;
         }


@@ -850,4 +779,11 @@ wxSize wxComboBox::DoGetBestSize() const
     return ret;
 }
 
     return ret;
 }
 

+// static
+wxVisualAttributes
+wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_new, true);
+}
+

 #endif
 #endif