X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/868a28262c40a7428d3991ca8a034674814bdb0a..5db1a502b4bf38f36a14c1377618d9eaae4c8e79:/src/gtk/choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index edcf64f3e9..6cc9718298 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -2,9 +2,8 @@
 // Name:        choice.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -66,22 +65,28 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
   
-  GtkWidget *menu;
-  menu = gtk_menu_new();
+  GtkWidget *menu = gtk_menu_new();
   
   for (int i = 0; i < n; i++)
   {
-    GtkWidget *item;
-    item = gtk_menu_item_new_with_label( choices[i] );
-    gtk_signal_connect( GTK_OBJECT( item ), "activate", 
-      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
+    GtkWidget *item = gtk_menu_item_new_with_label( choices[i] );
     gtk_menu_append( GTK_MENU(menu), item );
+    
+    gtk_widget_realize( item );
+    gtk_widget_realize( GTK_BIN(item)->child );
+    
     gtk_widget_show( item );
+    
+    gtk_signal_connect( GTK_OBJECT( item ), "activate", 
+      GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
   }
   gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
   
   PostCreation();
   
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+
   Show( TRUE );
     
   return TRUE;
@@ -89,27 +94,28 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
       
 void wxChoice::Append( const wxString &item )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid choice" );
+
   GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
-  GtkWidget *menu_item;
-  menu_item = gtk_menu_item_new_with_label( item );
+  GtkWidget *menu_item = gtk_menu_item_new_with_label( item );
   
-  if (m_hasOwnStyle)
-  {
-    GtkBin *bin = GTK_BIN( menu_item );
-    gtk_widget_set_style( bin->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-  }
+  gtk_menu_append( GTK_MENU(menu), menu_item );
+  
+  gtk_widget_realize( menu_item );
+  gtk_widget_realize( GTK_BIN(menu_item)->child );
+  
+  if (m_widgetStyle) ApplyWidgetStyle();
   
   gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", 
     GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     
-  gtk_menu_append( GTK_MENU(menu), menu_item );
   gtk_widget_show( menu_item );
 }
  
 void wxChoice::Clear(void)
 {
+  wxCHECK_RET( m_widget != NULL, "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 );
@@ -122,6 +128,8 @@ void wxChoice::Delete( int WXUNUSED(n) )
 
 int wxChoice::FindString( const wxString &string ) const
 {
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" );
+
   // If you read this code once and you think you understand
   // it, then you are very wrong. Robert Roebling.
   
@@ -154,6 +162,8 @@ int wxChoice::GetColumns(void) const
 
 int wxChoice::GetSelection(void)
 {
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid choice" );
+
   GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
   int count = 0;
   GList *child = menu_shell->children;
@@ -172,6 +182,8 @@ int wxChoice::GetSelection(void)
 
 wxString wxChoice::GetString( int n ) const
 {
+  wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
+
   GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
   int count = 0;
   GList *child = menu_shell->children;
@@ -199,6 +211,8 @@ wxString wxChoice::GetString( int n ) const
 
 wxString wxChoice::GetStringSelection(void) const
 {
+  wxCHECK_MSG( m_widget != NULL, "", "invalid choice" );
+
   GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
   
   wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
@@ -208,6 +222,8 @@ wxString wxChoice::GetStringSelection(void) const
 
 int wxChoice::Number(void) const
 {
+  wxCHECK_MSG( m_widget != NULL, 0, "invalid choice" );
+
   GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
   int count = 0;
   GList *child = menu_shell->children;
@@ -225,6 +241,8 @@ void wxChoice::SetColumns( int WXUNUSED(n) )
 
 void wxChoice::SetSelection( int n )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid choice" );
+
   int tmp = n;
   gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
   
@@ -233,27 +251,34 @@ void wxChoice::SetSelection( int n )
 
 void wxChoice::SetStringSelection( const wxString &string )
 {
+  wxCHECK_RET( m_widget != NULL, "invalid choice" );
+
   int n = FindString( string );
   if (n != -1) SetSelection( n );
 }
 
-void wxChoice::SetFont( const wxFont &font )
+void wxChoice::ApplyWidgetStyle()
 {
-  wxWindow::SetFont( font );
-   
+  SetWidgetStyle();
+  
   GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+  
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  gtk_widget_set_style( GTK_WIDGET( menu_shell ), m_widgetStyle );
+  
   GList *child = menu_shell->children;
   while (child)
   {
+    gtk_widget_set_style( GTK_WIDGET( child->data ), m_widgetStyle );
+    
     GtkBin *bin = GTK_BIN( child->data );
     GtkWidget *label = (GtkWidget *) NULL;
     if (bin->child) label = bin->child;
     if (!label) label = GTK_BUTTON(m_widget)->child;
     
-    gtk_widget_set_style( label,
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-	
+    gtk_widget_set_style( label, m_widgetStyle );
+    
     child = child->next;
   }
 }
+