wxDataObejct and related changes (won't compile right now)

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 21a697ce5756b8c9530bcf2004360bf6ebfc1d79..81d2380a015c987ef026d3f4df0196a324d7452c 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -75,7 +75,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     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 ))
     {

-        wxFAIL_MSG( T("wxChoice creation failed") );
+        wxFAIL_MSG( wxT("wxChoice creation failed") );

        return FALSE;
     }
 
        return FALSE;
     }
 


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

-        m_clientDataList.Append( (wxObject*) NULL );
-        m_clientObjectList.Append( (wxObject*) NULL );
+        m_clientList.Append( (wxObject*) NULL );

 
         GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
         gtk_menu_append( GTK_MENU(menu), item );
 
         GtkWidget *item = gtk_menu_item_new_with_label( choices[i].mbc_str() );
         gtk_menu_append( GTK_MENU(menu), item );


@@ -123,9 +122,9 @@ wxChoice::~wxChoice()
     Clear();
 }
 
     Clear();
 }
 

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

 {
 {

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

 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
     GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
 
     GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
     GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );


@@ -144,103 +143,86 @@ void wxChoice::AppendCommon( const wxString &item )
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 
     gtk_widget_show( menu_item );

-}
-
-void wxChoice::Append( const wxString &item )
-{
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
-}
-
-void wxChoice::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*) NULL );

 
 

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

 
 

-    AppendCommon( item );
+    // return the index of the item in the control
+    return GetCount() - 1;

 }
 
 }
 

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

 {
 {

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

 
 

-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientData") );

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

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

 {
 {

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

 
 

-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetClientData") );

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

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

 {
 {

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

 
 

-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetClientObject") );

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

-    if (cd) delete cd;
+    delete cd;

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

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

 {
 {

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

 
 

-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxChoice::DoGetClientObject") );

 
     return (wxClientData*) node->Data();
 }
 
 void wxChoice::Clear()
 {
 
     return (wxClientData*) node->Data();
 }
 
 void wxChoice::Clear()
 {

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

 
     gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
     GtkWidget *menu = gtk_menu_new();
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 
 
     gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
     GtkWidget *menu = gtk_menu_new();
     gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
 

-    wxNode *node = m_clientObjectList.First();
-    while (node)
+    if (m_clientDataItemsType == ClientData_Object)

     {
     {

-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
+        wxNode *node = m_clientList.First();   
+        while (node)
+        {
+            wxClientData *cd = (wxClientData*)node->Data();
+            if (cd) delete cd;
+            node = node->Next();
+       }

     }
     }

-    m_clientObjectList.Clear();
-
-    m_clientDataList.Clear();
+    m_clientList.Clear();

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

-    wxFAIL_MSG( T("wxChoice:Delete not implemented") );
+    wxFAIL_MSG( wxT("wxChoice:Delete not implemented") );

 }
 
 int wxChoice::FindString( const wxString &string ) const
 {
 }
 
 int wxChoice::FindString( const wxString &string ) const
 {

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

 
     // If you read this code once and you think you understand
     // it, then you are very wrong. Robert Roebling.
 
     // If you read this code once and you think you understand
     // it, then you are very wrong. Robert Roebling.


@@ -255,7 +237,7 @@ int wxChoice::FindString( const wxString &string ) const
         if (bin->child) label = GTK_LABEL(bin->child);
         if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
 
         if (bin->child) label = GTK_LABEL(bin->child);
         if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
 

-        wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+        wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );

 
        if (string == wxString(label->label,*wxConvCurrent))
            return count;
 
        if (string == wxString(label->label,*wxConvCurrent))
            return count;


@@ -267,14 +249,9 @@ int wxChoice::FindString( const wxString &string ) const
     return -1;
 }
 
     return -1;
 }
 

-int wxChoice::GetColumns() const
-{
-    return 1;
-}
-
-int wxChoice::GetSelection()
+int wxChoice::GetSelection() const

 {
 {

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

 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;


@@ -292,7 +269,7 @@ int wxChoice::GetSelection()
 
 wxString wxChoice::GetString( int n ) const
 {
 
 wxString wxChoice::GetString( int n ) const
 {

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

 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;


@@ -306,7 +283,7 @@ wxString wxChoice::GetString( int n ) const
             if (bin->child) label = GTK_LABEL(bin->child);
             if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
 
             if (bin->child) label = GTK_LABEL(bin->child);
             if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
 

-            wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+            wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );

 
             return wxString(label->label,*wxConvCurrent);
         }
 
             return wxString(label->label,*wxConvCurrent);
         }


@@ -314,25 +291,14 @@ wxString wxChoice::GetString( int n ) const
         count++;
     }
 
         count++;
     }
 

-    wxFAIL_MSG( T("wxChoice: invalid index in GetString()") );
-
-    return T("");
-}
-
-wxString wxChoice::GetStringSelection() const
-{
-    wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
-
-    GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
-
-    wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
+    wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );

 
 

-    return wxString(label->label,*wxConvCurrent);
+    return wxT("");

 }
 
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, 0, T("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );

 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;
 
     GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
     int count = 0;


@@ -345,26 +311,14 @@ int wxChoice::Number() const
     return count;
 }
 
     return count;
 }
 

-void wxChoice::SetColumns( int WXUNUSED(n) )
-{
-}
-

 void wxChoice::SetSelection( int n )
 {
 void wxChoice::SetSelection( int n )
 {

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

 
     int tmp = n;
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 }
 
 
     int tmp = n;
     gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
 }
 

-void wxChoice::SetStringSelection( const wxString &string )
-{
-    wxCHECK_RET( m_widget != NULL, T("invalid choice") );
-
-    int n = FindString( string );
-    if (n != -1) SetSelection( n );
-}
-

 void wxChoice::DisableEvents()
 {
 /*
 void wxChoice::DisableEvents()
 {
 /*