ScanParam has only one parameter now

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

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index bd63c5e3f805ee8ae64d7b3e6527f1dd3c4e4b0e..c78d0a2e8fbd15aafd6a4ed644e70774e56cca99 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -38,7 +38,8 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
 
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+      wxapp_install_idle_handler();

 
     if (!choice->m_hasVMT) return;
 
 
     if (!choice->m_hasVMT) return;
 


@@ -71,11 +72,12 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     m_acceptsFocus = TRUE;
 #endif
 
     m_acceptsFocus = TRUE;
 #endif
 

-    PreCreation( parent, id, pos, size, style, name );
-
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( _T("wxChoice creation failed") );
+       return FALSE;
+    }

 
     m_widget = gtk_option_menu_new();
 
 
     m_widget = gtk_option_menu_new();
 


@@ -285,8 +287,6 @@ int wxChoice::GetSelection()
         count++;
     }
 
         count++;
     }
 

-    wxFAIL_MSG( _T("wxChoice: no selection") );
-

     return -1;
 }
 
     return -1;
 }
 


@@ -355,8 +355,6 @@ 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 )
 }
 
 void wxChoice::SetStringSelection( const wxString &string )


@@ -367,6 +365,36 @@ void wxChoice::SetStringSelection( const wxString &string )
     if (n != -1) SetSelection( n );
 }
 
     if (n != -1) SetSelection( n );
 }
 

+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();