update GTK size hints when window decorations change

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index a7f05f679afed006baec1e027f89a933723f5465..af2b1092fdbcdd91a5331ab62d2c7ac6f8892af4 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -40,9 +40,6 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
 extern "C" {
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {

-    if (g_isIdle)
-      wxapp_install_idle_handler();
-

     if (!choice->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
     if (!choice->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;


@@ -65,7 +62,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
     else if ( choice->HasClientUntypedData() )
         event.SetClientData( choice->GetClientData(n) );
 
     else if ( choice->HasClientUntypedData() )
         event.SetClientData( choice->GetClientData(n) );
 

-    choice->GetEventHandler()->ProcessEvent(event);
+    choice->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -73,7 +70,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 
 wxChoice::wxChoice()
 {
 
 wxChoice::wxChoice()
 {


@@ -97,11 +94,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
                        int n, const wxString choices[],
                        long style, const wxValidator& validator, const wxString &name )
 {
                        int n, const wxString choices[],
                        long style, const wxValidator& validator, const wxString &name )
 {

-    m_needParent = true;
-#if (GTK_MINOR_VERSION > 0)
-    m_acceptsFocus = true;
-#endif
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -111,15 +103,15 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_option_menu_new();
 
 
     m_widget = gtk_option_menu_new();
 

-    if ( style & wxCB_SORT )
+    if ( IsSorted() )

     {
     {

-        // if our m_strings != NULL, DoAppend() will check for it and insert
+        // if our m_strings != NULL, Append() will check for it and insert

         // items in the correct order
         m_strings = new wxSortedArrayString;
     }
 
         // items in the correct order
         m_strings = new wxSortedArrayString;
     }
 

-    // begin with no selection
-    m_selection_hack = wxNOT_FOUND;
+    // If we have items, GTK will choose the first item by default
+    m_selection_hack = n > 0 ? 0 : wxNOT_FOUND;

 
     GtkWidget *menu = gtk_menu_new();
 
 
     GtkWidget *menu = gtk_menu_new();
 


@@ -133,7 +125,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    SetInitialSize(size); // need this too because this is a wxControlWithItems

 
     return true;
 }
 
     return true;
 }


@@ -145,79 +137,52 @@ wxChoice::~wxChoice()
     delete m_strings;
 }
 
     delete m_strings;
 }
 

-int wxChoice::DoAppend( const wxString &item )
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

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

-    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
-
-    return GtkAddHelper(menu, GetCount(), item);
-}
+    const unsigned int count = items.GetCount();

 
 

-int wxChoice::DoInsert(const wxString &item, unsigned int pos)
-{
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
-    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
+    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );

 
 

-    if (pos == GetCount())
-        return DoAppend(item);
+    for ( unsigned int i = 0; i < count; ++i, ++pos )
+    {
+        int n = GtkAddHelper(menu, pos, items[i]);
+        if ( n == wxNOT_FOUND )
+            return n;

 
 

-    GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
+        AssignNewItemClientData(n, clientData, i, type);
+    }

 
     // if the item to insert is at or before the selection, and the selection is valid
     if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
     {
 
     // if the item to insert is at or before the selection, and the selection is valid
     if (((int)pos <= m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
     {

-        // move the selection forward one
-        m_selection_hack++;
+        // move the selection forward
+        m_selection_hack += count;

     }
 
     }
 

-    return GtkAddHelper(menu, pos, item);
+    // We must set the selection so that it can be read back even if 
+    // the user has not modified it since GTK+ will then select the
+    // first item so well return 0.
+    if ((count > 0) && (m_selection_hack==wxNOT_FOUND))
+        m_selection_hack = 0;
+
+    return pos - 1;

 }
 
 void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 {
 }
 
 void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
-
-    node->SetData( (wxObject*) clientData );
+    m_clientData[n] = clientData;

 }
 
 void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
 }
 
 void* wxChoice::DoGetItemClientData(unsigned int n) const
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
-
-    return node->GetData();
+    return m_clientData[n];

 }
 
 }
 

-void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxChoice::DoGetItemClientObject") );
-
-    return (wxClientData*) node->GetData();
-}
-
-void wxChoice::Clear()
+void wxChoice::DoClear()

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


@@ -225,19 +190,7 @@ void wxChoice::Clear()
     GtkWidget *menu = gtk_menu_new();
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 
     GtkWidget *menu = gtk_menu_new();
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 

-    if ( HasClientObjectData() )
-    {
-        // 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!
-        wxList::compatibility_iterator node = m_clientList.GetFirst();
-        while ( node )
-        {
-            delete (wxClientData *)node->GetData();
-            node = node->GetNext();
-        }
-    }
-    m_clientList.Clear();
+    m_clientData.Clear();

 
     if ( m_strings )
         m_strings->Clear();
 
     if ( m_strings )
         m_strings->Clear();


@@ -246,16 +199,11 @@ void wxChoice::Clear()
     m_selection_hack = wxNOT_FOUND;
 }
 
     m_selection_hack = wxNOT_FOUND;
 }
 

-void wxChoice::Delete(unsigned int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
     wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
 
 {
     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
-    unsigned int i;
-    const unsigned int count = GetCount();
-

     // if the item to delete is before the selection, and the selection is valid
     if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
     {
     // if the item to delete is before the selection, and the selection is valid
     if (((int)n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
     {


@@ -268,56 +216,34 @@ void wxChoice::Delete(unsigned int n)
         m_selection_hack = wxNOT_FOUND;
     }
 
         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();
+    // 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
+    const unsigned int count = GetCount();

 
     wxArrayString items;
     wxArrayPtrVoid itemsData;
 
     wxArrayString items;
     wxArrayPtrVoid itemsData;

-    items.Alloc(count);
-    for ( i = 0; i < count; i++ )
+    items.Alloc(count - 1);
+    itemsData.Alloc(count - 1);
+    for ( unsigned i = 0; i < count; i++ )

     {
         if ( i != n )
         {
             items.Add(GetString(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();
+            itemsData.Add(m_clientData[i]);

         }
     }
 
         }
     }
 

-    if ( hasObjectData )
-    {
-        // prevent Clear() from destroying all client data
-        m_clientDataItemsType = wxClientData_None;
-    }
-
-    Clear();
+    wxChoice::DoClear();

 
 

-    for ( i = 0; i < count - 1; i++ )
+    if ( count > 1 )

     {
     {

-        Append(items[i]);
-
-        if ( hasObjectData )
-            SetClientObject(i, (wxClientData *)itemsData[i]);
-        else if ( hasClientData )
-            SetClientData(i, itemsData[i]);
+        void ** const data = &itemsData[0];
+        if ( HasClientObjectData() )
+            Append(items, wx_reinterpret_cast(wxClientData **, data));
+        else
+            Append(items, data);

     }
     }

+    //else: the control is now empty, nothing to append

 }
 
 int wxChoice::FindString( const wxString &string, bool bCase ) const
 }
 
 int wxChoice::FindString( const wxString &string, bool bCase ) const


@@ -381,6 +307,8 @@ void wxChoice::SetString(unsigned int n, const wxString& str)
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
             gtk_label_set_text( label, wxGTK_CONV( str ) );
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
             gtk_label_set_text( label, wxGTK_CONV( str ) );

+            
+            InvalidateBestSize();

 
             return;
         }
 
             return;
         }


@@ -488,47 +416,24 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 
 int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
 {
 
 int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item)
 {

-    wxCHECK_MSG(pos<=m_clientList.GetCount(), -1, wxT("invalid index"));
+    wxCHECK_MSG(pos<=m_clientData.GetCount(), -1, wxT("invalid index"));

 
     GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
 
 
     GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
 

-    unsigned int index;

     if ( m_strings )
     {
         // sorted control, need to insert at the correct index
     if ( m_strings )
     {
         // sorted control, need to insert at the correct index

-        index = m_strings->Add(item);
-
-        gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, index );
-
-        if ( index )
-        {
-            m_clientList.Insert( m_clientList.Item(index - 1),
-                                 (wxObject*) NULL );
-        }
-        else
-        {
-            m_clientList.Insert( (wxObject*) NULL );
-        }
+        pos = m_strings->Add(item);

     }
     }

+
+    // don't call wxChoice::GetCount() from here because it doesn't work
+    // if we're called from ctor (and GtkMenuShell is still NULL)
+    if (pos == m_clientData.GetCount())
+        gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );

     else
     else

-    {
-        // don't call wxChoice::GetCount() from here because it doesn't work
-        // if we're called from ctor (and GtkMenuShell is still NULL)
+        gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );

 
 

-        // normal control, just append
-        if (pos == m_clientList.GetCount())
-        {
-            gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
-            m_clientList.Append( (wxObject*) NULL );
-            index = m_clientList.GetCount() - 1;
-        }
-        else
-        {
-            gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos );
-            m_clientList.Insert( pos, (wxObject*) NULL );
-            index = pos;
-        }
-    }
+    m_clientData.Insert( NULL, pos );

 
     if (GTK_WIDGET_REALIZED(m_widget))
     {
 
     if (GTK_WIDGET_REALIZED(m_widget))
     {


@@ -551,7 +456,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& it
     gtk_widget_show( menu_item );
 
     // return the index of the item in the control
     gtk_widget_show( menu_item );
 
     // return the index of the item in the control

-    return index;
+    return pos;

 }
 
 wxSize wxChoice::DoGetBestSize() const
 }
 
 wxSize wxChoice::DoGetBestSize() const


@@ -599,7 +504,7 @@ wxSize wxChoice::DoGetBestSize() const
     return ret;
 }
 
     return ret;
 }
 

-bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
     return GTK_BUTTON(m_widget)->event_window;
 }
 {
     return GTK_BUTTON(m_widget)->event_window;
 }