removed dialup from list of files because of compilation problem with

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 44c8f53503bd68b31ebaa669f21fef8722c1793a..d794e2a915de0979ee77102f060cbb8a4320319f 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -46,9 +46,17 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
     if (g_blockEventsOnDrag) return;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );

-    event.SetInt( choice->GetSelection() );
+    int n = choice->GetSelection();
+
+    event.SetInt( n );

     event.SetString( choice->GetStringSelection() );
     event.SetEventObject(choice);
     event.SetString( choice->GetStringSelection() );
     event.SetEventObject(choice);

+
+    if ( choice->HasClientObjectData() )
+        event.SetClientObject( choice->GetClientObject(n) );
+    else if ( choice->HasClientUntypedData() )
+        event.SetClientData( choice->GetClientData(n) );
+

     choice->GetEventHandler()->ProcessEvent(event);
 }
 
     choice->GetEventHandler()->ProcessEvent(event);
 }
 


@@ -82,13 +90,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_option_menu_new();
 
 
     m_widget = gtk_option_menu_new();
 

-    wxSize newSize(size);
-    if (newSize.x == -1)
-        newSize.x = 80;
-    if (newSize.y == -1)
-        newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
-

     if ( style & wxCB_SORT )
     {
         // if our m_strings != NULL, DoAppend() will check for it and insert
     if ( style & wxCB_SORT )
     {
         // if our m_strings != NULL, DoAppend() will check for it and insert


@@ -100,7 +101,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     for (int i = 0; i < n; i++)
     {
 
     for (int i = 0; i < n; i++)
     {

-        AppendHelper(menu, choices[i]);
+        GtkAppendHelper(menu, choices[i]);

     }
 
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
     }
 
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );


@@ -109,9 +110,19 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

+    SetFont( parent->GetFont() );
+
+    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.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -127,39 +138,39 @@ wxChoice::~wxChoice()
 
 int wxChoice::DoAppend( const wxString &item )
 {
 
 int wxChoice::DoAppend( const wxString &item )
 {

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

 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
 
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
 

-    return AppendHelper(menu, item);
+    return GtkAppendHelper(menu, item);

 }
 
 }
 

-void wxChoice::DoSetClientData( int n, void* clientData )
+void wxChoice::DoSetItemClientData( int n, void* clientData )

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );

 
     wxNode *node = m_clientList.Nth( n );
 
     wxNode *node = m_clientList.Nth( n );

-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientData") );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );

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

-void* wxChoice::DoGetClientData( int n ) const
+void* wxChoice::DoGetItemClientData( int n ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid choice control") );

 
     wxNode *node = m_clientList.Nth( n );
 
     wxNode *node = m_clientList.Nth( n );

-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetClientData") );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );

 
     return node->Data();
 }
 
 
     return node->Data();
 }
 

-void wxChoice::DoSetClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid choice control") );

 
     wxNode *node = m_clientList.Nth( n );
 
     wxNode *node = m_clientList.Nth( n );

-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientObject") );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );

 
     wxClientData *cd = (wxClientData*) node->Data();
     delete cd;
 
     wxClientData *cd = (wxClientData*) node->Data();
     delete cd;


@@ -167,13 +178,13 @@ void wxChoice::DoSetClientObject( int n, wxClientData* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
     node->SetData( (wxObject*) clientData );
 }
 

-wxClientData* wxChoice::DoGetClientObject( int n ) const
+wxClientData* wxChoice::DoGetItemClientObject( int n ) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid choice control") );

 
     wxNode *node = m_clientList.Nth( n );
     wxCHECK_MSG( node, (wxClientData *)NULL,
 
     wxNode *node = m_clientList.Nth( n );
     wxCHECK_MSG( node, (wxClientData *)NULL,

-                 wxT("invalid index in wxChoice::DoGetClientObject") );
+                 wxT("invalid index in wxChoice::DoGetItemClientObject") );

 
     return (wxClientData*) node->Data();
 }
 
     return (wxClientData*) node->Data();
 }


@@ -186,17 +197,22 @@ 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 (m_clientDataItemsType == ClientData_Object)
+    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!

         wxNode *node = m_clientList.First();
         wxNode *node = m_clientList.First();

-        while (node)
+        while ( node )

         {
         {

-            wxClientData *cd = (wxClientData*)node->Data();
-            if (cd) delete cd;
+            delete (wxClientData *)node->Data();

             node = node->Next();
         }
     }
     m_clientList.Clear();
             node = node->Next();
         }
     }
     m_clientList.Clear();

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

 }
 
 void wxChoice::Delete( int WXUNUSED(n) )
 }
 
 void wxChoice::Delete( int WXUNUSED(n) )


@@ -251,6 +267,13 @@ int wxChoice::GetSelection() const
     return -1;
 }
 
     return -1;
 }
 

+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
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
 wxString wxChoice::GetString( int n ) const
 {
     wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );


@@ -303,36 +326,6 @@ void wxChoice::SetSelection( int n )
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 }
 
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 }
 

-void wxChoice::DisableEvents()
-{
-/*
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        gtk_signal_disconnect_by_func( GTK_OBJECT( child->data ),
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
-        child = child->next;
-    }
-*/
-}
-
-void wxChoice::EnableEvents()
-{
-/*
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
-    GList *child = menu_shell->children;
-    while (child)
-    {
-        gtk_signal_connect( GTK_OBJECT( child->data ), "activate",
-          GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
-
-        child = child->next;
-    }
-*/
-}
-

 void wxChoice::ApplyWidgetStyle()
 {
     SetWidgetStyle();
 void wxChoice::ApplyWidgetStyle()
 {
     SetWidgetStyle();


@@ -358,7 +351,7 @@ void wxChoice::ApplyWidgetStyle()
     }
 }
 
     }
 }
 

-size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
+size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)

 {
     GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
 
 {
     GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
 


@@ -377,8 +370,7 @@ size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
         }
         else
         {
         }
         else
         {

-            // can't use Insert() :-(
-            m_clientList.Append( (wxObject*) NULL );
+            m_clientList.Insert( (wxObject*) NULL );

         }
     }
     else
         }
     }
     else


@@ -390,7 +382,7 @@ size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
 
         // don't call wxChoice::GetCount() from here because it doesn't work
         // if we're called from ctor (and GtkMenuShell is still NULL)
 
         // don't call wxChoice::GetCount() from here because it doesn't work
         // if we're called from ctor (and GtkMenuShell is still NULL)

-        index = m_clientList.GetCount();
+        index = m_clientList.GetCount() - 1;

     }
 
     if (GTK_WIDGET_REALIZED(m_widget))
     }
 
     if (GTK_WIDGET_REALIZED(m_widget))


@@ -410,4 +402,12 @@ size_t wxChoice::AppendHelper(GtkWidget *menu, const wxString& item)
     return index;
 }
 
     return index;
 }
 

+wxSize wxChoice::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+    if (ret.x < 80) ret.x = 80;
+    ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
+    return ret;
+}
+

 #endif
 #endif