Separated out book control sizing code

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 6dbc4a9cd1485d1d02db186d00de0a2325f0cb41..24359aa201bb5b0d34904924e98e495be6cde6b2 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/gtk/choice.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,11 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "choice.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_CHOICE
 #include "wx/defs.h"
 
 #if wxUSE_CHOICE


@@ -50,25 +45,8 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *
 
     int selection = wxNOT_FOUND;
 
 
     int selection = wxNOT_FOUND;
 

-#ifdef __WXGTK20__

     selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );
     selection = gtk_option_menu_get_history( GTK_OPTION_MENU(choice->GetHandle()) );

-#else
-    GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(choice->GetHandle()) ) );
-    int count = 0;

 
 

-    GList *child = menu_shell->children;
-    while (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        if (!bin->child)
-        {
-            selection = count;
-            break;
-        }
-        child = child->next;
-        count++;
-    }
-#endif

     choice->m_selection_hack = selection;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
     choice->m_selection_hack = selection;
 
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );


@@ -339,9 +317,9 @@ void wxChoice::Delete( int n )
     }
 }
 
     }
 }
 

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

 {
 {

-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
+    wxCHECK_MSG( m_widget != NULL, wxNOT_FOUND, 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.


@@ -360,12 +338,8 @@ int wxChoice::FindString( const wxString &string ) const
 
         wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
 
         wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 

-#ifdef __WXGTK20__

          wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
          wxString tmp( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );

-#else
-         wxString tmp( label->label );
-#endif
-        if (string == tmp)
+        if (string.IsSameAs( tmp, bCase ))

             return count;
 
         child = child->next;
             return count;
 
         child = child->next;


@@ -377,7 +351,7 @@ int wxChoice::FindString( const wxString &string ) const
 
 int wxChoice::GetSelection() const
 {
 
 int wxChoice::GetSelection() const
 {

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

 
     return m_selection_hack;
 
 
     return m_selection_hack;
 


@@ -432,11 +406,7 @@ wxString wxChoice::GetString( int n ) const
 
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 
 
             wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
 

-#ifdef __WXGTK20__

             return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );
             return wxString( wxGTK_CONV_BACK( gtk_label_get_text( label) ) );

-#else
-            return wxString( label->label );
-#endif

         }
         child = child->next;
         count++;
         }
         child = child->next;
         count++;


@@ -571,8 +541,9 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
 
     // it has to change. Adapted from Matt Ownby.
     InvalidateBestSize();
 

-    gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate",
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+    g_signal_connect_after (menu_item, "activate",
+                            G_CALLBACK (gtk_choice_clicked_callback),
+                            this);

 
     gtk_widget_show( menu_item );
 
 
     gtk_widget_show( menu_item );
 


@@ -627,11 +598,7 @@ wxSize wxChoice::DoGetBestSize() const
 
 bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
 {

-#ifdef __WXGTK20__

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

-#else
-    return (window == m_widget->window);
-#endif

 }
 
 // static
 }
 
 // static