Commented out Robert's SetFont change for now; changed menu handling slightly

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index 17535c188aa58027f36ea82f3fde7f323b0cec62..edcf64f3e96fbae595f4b3cd0e63d15ee8995a7d 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -16,45 +16,49 @@
 #include "wx/choice.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/choice.h"
 
 //-----------------------------------------------------------------------------

-// wxChoice
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "activate"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )

 {
 {

-  wxChoice *choice = (wxChoice*)data;
-  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId());
+  if (!choice->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
+  wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );

   event.SetInt( choice->GetSelection() );
   wxString tmp( choice->GetStringSelection() );
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject(choice);
   event.SetInt( choice->GetSelection() );
   wxString tmp( choice->GetStringSelection() );
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject(choice);

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

 
 

+//-----------------------------------------------------------------------------
+// wxChoice

 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
 
 wxChoice::wxChoice(void)
 {
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
 
 wxChoice::wxChoice(void)
 {

-};
-
-wxChoice::wxChoice( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const long style, const wxString &name )
-{
-  Create( parent, id, pos, size, n, choices, style, name );
-};
+}

 
 

-bool wxChoice::Create( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const long style, const wxString &name )
+bool wxChoice::Create( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos, const wxSize &size,
+      int n, const wxString choices[],
+      long style, const wxValidator& validator, const wxString &name )

 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   

+  SetValidator( validator );
+

   m_widget = gtk_option_menu_new();
   
   wxSize newSize = size;
   m_widget = gtk_option_menu_new();
   
   wxSize newSize = size;


@@ -73,7 +77,7 @@ bool wxChoice::Create( wxWindow *parent, const wxWindowID id,
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     gtk_menu_append( GTK_MENU(menu), item );
     gtk_widget_show( item );
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     gtk_menu_append( GTK_MENU(menu), item );
     gtk_widget_show( item );

-  };
+  }

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


@@ -81,30 +85,45 @@ bool wxChoice::Create( wxWindow *parent, const wxWindowID id,
   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;

-};
+}

       
 void wxChoice::Append( const wxString &item )
 {
   GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
   GtkWidget *menu_item;
   menu_item = gtk_menu_item_new_with_label( item );
       
 void wxChoice::Append( const wxString &item )
 {
   GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
   GtkWidget *menu_item;
   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_signal_connect( GTK_OBJECT( menu_item ), "activate", 
     GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
   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 );
   gtk_menu_append( GTK_MENU(menu), menu_item );
   gtk_widget_show( menu_item );

-};
+}

  
 void wxChoice::Clear(void)
 {
   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 );
  
 void wxChoice::Clear(void)
 {
   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 );

-};
+}
+
+void wxChoice::Delete( int WXUNUSED(n) )
+{
+  wxFAIL_MSG( "wxChoice:Delete not implemented" );
+}

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

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

   
   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;


@@ -112,19 +131,26 @@ int wxChoice::FindString( const wxString &string ) const
   while (child)
   {
     GtkBin *bin = GTK_BIN( child->data );
   while (child)
   {
     GtkBin *bin = GTK_BIN( child->data );

-    GtkLabel *label = GTK_LABEL(bin->child);
+    GtkLabel *label = (GtkLabel *) NULL;
+    if (bin->child) label = GTK_LABEL(bin->child);

     if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
     if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );

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

     if (string == label->label) return count;
     child = child->next;
     count++;
     if (string == label->label) return count;
     child = child->next;
     count++;

-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: string not found" );
+  

   return -1;
   return -1;

-};
+}

 
 int wxChoice::GetColumns(void) const
 {
   return 1;
 
 int wxChoice::GetColumns(void) const
 {
   return 1;

-};
+}

 
 int wxChoice::GetSelection(void)
 {
 
 int wxChoice::GetSelection(void)
 {


@@ -137,11 +163,14 @@ int wxChoice::GetSelection(void)
     if (!bin->child) return count;
     child = child->next;
     count++;
     if (!bin->child) return count;
     child = child->next;
     count++;

-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: no selection" );
+  

   return -1;
   return -1;

-};
+}

 
 

-wxString wxChoice::GetString( const int n ) const
+wxString wxChoice::GetString( int n ) const

 {
   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;


@@ -151,48 +180,80 @@ wxString wxChoice::GetString( const int n ) const
     GtkBin *bin = GTK_BIN( child->data );
     if (count == n)
     {
     GtkBin *bin = GTK_BIN( child->data );
     if (count == n)
     {

-      GtkLabel *label = GTK_LABEL(bin->child);
+      GtkLabel *label = (GtkLabel *) NULL;
+      if (bin->child) label = GTK_LABEL(bin->child);

       if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
       if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );

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

       return label->label;
       return label->label;

-    };
+    }

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

-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: string not found" );
+  

   return "";
   return "";

-};
+}

 
 wxString wxChoice::GetStringSelection(void) const
 {
   GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
 
 wxString wxChoice::GetStringSelection(void) const
 {
   GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );

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

   return label->label;
   return label->label;

-};
+}

 
 int wxChoice::Number(void) const
 {
 
 int wxChoice::Number(void) const
 {

-  GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );

   int count = 0;
   int count = 0;

-  GList *child = menu->children;
+  GList *child = menu_shell->children;

   while (child)
   {
     count++;
     child = child->next;
   while (child)
   {
     count++;
     child = child->next;

-  };
+  }

   return count;
   return count;

-};
+}

 
 

-void wxChoice::SetColumns( const int WXUNUSED(n) )
+void wxChoice::SetColumns( int WXUNUSED(n) )

 {
 {

-};
+}

 
 

-void wxChoice::SetSelection( const int n )
+void wxChoice::SetSelection( int n )

 {
   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 );

-};
+  
+  gtk_choice_clicked_callback( (GtkWidget *) NULL, this );
+}

 
 void wxChoice::SetStringSelection( const wxString &string )
 {
   int n = FindString( string );
   if (n != -1) SetSelection( n );
 
 void wxChoice::SetStringSelection( const wxString &string )
 {
   int n = FindString( string );
   if (n != -1) SetSelection( n );

-};
+}

 
 

+void wxChoice::SetFont( const wxFont &font )
+{
+  wxWindow::SetFont( font );
+   
+  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+  GList *child = menu_shell->children;
+  while (child)
+  {
+    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 ) ) ); 
+       
+    child = child->next;
+  }
+}