fixed compilation problem with old gcc releases

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index b772e750a81ade70652d3fdf650423f1fc4325e8..103ebf3901cd60fb5f12811f981d7b2d475d4192 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -12,12 +12,13 @@
 #pragma implementation "choice.h"
 #endif
 
 #pragma implementation "choice.h"
 #endif
 

-#include "wx/choice.h"
+#include "wx/defs.h"

 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/choice.h"
+
+#include "wx/gtk/private.h"

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


@@ -90,13 +91,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


@@ -108,7 +102,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 );


@@ -117,9 +111,12 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
 
     PostCreation();
 

+    SetFont( parent->GetFont() );
+
+    SetBestSize(size);
+

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

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -139,7 +136,7 @@ int wxChoice::DoAppend( const wxString &item )
 
     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::DoSetItemClientData( int n, void* clientData )
 }
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )


@@ -231,16 +228,18 @@ int wxChoice::FindString( const wxString &string ) const
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = (GtkLabel *) NULL;
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = (GtkLabel *) NULL;

-        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( BUTTON_CHILD(m_widget) );

 
         wxASSERT_MSG( label != NULL , wxT("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;

 
 

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

     }
 
     return -1;
     }
 
     return -1;


@@ -284,8 +283,10 @@ wxString wxChoice::GetString( int n ) const
         if (count == n)
         {
             GtkLabel *label = (GtkLabel *) NULL;
         if (count == n)
         {
             GtkLabel *label = (GtkLabel *) NULL;

-            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( BUTTON_CHILD(m_widget) );

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


@@ -323,36 +324,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();


@@ -369,8 +340,10 @@ void wxChoice::ApplyWidgetStyle()
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkWidget *label = (GtkWidget *) NULL;
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkWidget *label = (GtkWidget *) NULL;

-        if (bin->child) label = bin->child;
-        if (!label) label = GTK_BUTTON(m_widget)->child;
+        if (bin->child)
+            label = bin->child;
+        if (!label)
+            label = BUTTON_CHILD(m_widget);

 
         gtk_widget_set_style( label, m_widgetStyle );
 
 
         gtk_widget_set_style( label, m_widgetStyle );
 


@@ -378,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() );
 


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

-#endif
+wxSize wxChoice::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+
+    // we know better our horizontal extent: it depends on the longest string
+    // we have
+    ret.x = 0;
+    if ( m_widget )
+    {
+        GdkFont *font = m_font.GetInternalFont();
+
+        wxCoord width;
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            width = (wxCoord)gdk_string_width(font, GetString(n).mbc_str());
+            if ( width > ret.x )
+                ret.x = width;
+        }
+
+        // add extra for the choice "=" button
+
+        // VZ: I don't know how to get the right value, it seems to be in
+        //     GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get
+        //     to it - maybe we can use gtk_option_menu_size_request() for this
+        //     somehow?
+        //
+        //     This default value works only for the default GTK+ theme (i.e.
+        //     no theme at all) (FIXME)
+        static const int widthChoiceIndicator = 35;
+        ret.x += widthChoiceIndicator;
+    }
+
+    // but not less than the minimal width
+    if ( ret.x < 80 )
+        ret.x = 80;
+
+    ret.y = 16 + gdk_char_height(GET_STYLE_FONT( m_widget->style ), 'H');
+
+    return ret;
+}
+
+#endif // wxUSE_CHOICE
+