Se agregan callbacks dummy para los radio buttons.

diff --git a/callbacks.cpp b/callbacks.cpp
index 3f498e0cb40af7f6b4876aa6d3449346c18907fb..e1098f3376a5631d3743f5914ac927674e45b589 100644 (file)
--- a/callbacks.cpp
+++ b/callbacks.cpp
@@ -90,3 +90,28 @@ gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event,
     return FALSE;
 }
 
     return FALSE;
 }
 

+#include <iostream> // FIXME
+void on_radiobutton_linea_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data) {
+    // TODO
+    std::cerr << "En linea event." << std::endl;
+}
+
+void on_radiobutton_cuadrado_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data) {
+    // TODO
+    std::cerr << "En cuadrado event." << std::endl;
+}
+
+void on_radiobutton_rectangulo_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data) {
+    // TODO
+    std::cerr << "En rectangulo event." << std::endl;
+}
+
+void on_radiobutton_circulo_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data) {
+    // TODO
+    std::cerr << "En circulo event." << std::endl;
+}
+

diff --git a/callbacks.h b/callbacks.h
index 508bf24bb9ca3953d1ba86eb1806d57272ff0ce7..e7cb716886cacc3cdc1e6be30ed1f11caa1b2dbc 100644 (file)
--- a/callbacks.h
+++ b/callbacks.h
@@ -29,3 +29,15 @@ void on_button_agregar_clicked(GtkButton *button, gpointer user_data);
 
 gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event,
         gpointer user_data);
 
 gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event,
         gpointer user_data);

+
+void on_radiobutton_linea_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data);
+
+void on_radiobutton_cuadrado_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data);
+
+void on_radiobutton_rectangulo_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data);
+
+void on_radiobutton_circulo_toggled(GtkToggleButton *togglebutton,
+        gpointer user_data);

diff --git a/interface.cpp b/interface.cpp
index 6ed9f3f7ebdfdcecb9bd3440b1c95513e14a3404..bc3809cf54ad595666f6af53fd971304b21f9e93 100644 (file)
--- a/interface.cpp
+++ b/interface.cpp
@@ -1,15 +1,15 @@
 /* vim: set et sts=4 sw=4 fdm=indent fdn=1 fo+=t tw=80 fileencoding=utf-8:
  *
 /* vim: set et sts=4 sw=4 fdm=indent fdn=1 fo+=t tw=80 fileencoding=utf-8:
  *

- * Taller de ProgramaciÃ\83³n (75.42).
+ * Taller de ProgramaciÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82³n (75.42).

  *
  *

- * Ejercicio NÃ\83ºmero 5:
+ * Ejercicio NÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82ºmero 5:

  * Graficador de figuras.
  *
  * Copyleft 2003 - Leandro Lucarella <llucare@fi.uba.ar>
  * Graficador de figuras.
  *
  * Copyleft 2003 - Leandro Lucarella <llucare@fi.uba.ar>

- * Puede copiar, modificar y distribuir este programa bajo los tÃ\83©rminos de
+ * Puede copiar, modificar y distribuir este programa bajo los tÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82©rminos de

  * la licencia GPL (http://www.gnu.org/).
  *
  * la licencia GPL (http://www.gnu.org/).
  *

- * Creado: miÃ\83© oct  1 23:31:40 ART 2003
+ * Creado: miÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82© oct  1 23:31:40 ART 2003

  *
  * $Id$
  */
  *
  * $Id$
  */


@@ -101,7 +101,7 @@ create_window (Dibujo* dibujo)
 
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_container_set_border_width (GTK_CONTAINER (window), 5);
 
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_container_set_border_width (GTK_CONTAINER (window), 5);

-    gtk_window_set_title (GTK_WINDOW (window), "Trabajo PrÃ\83¡ctico V");
+    gtk_window_set_title (GTK_WINDOW (window), "Trabajo PrÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82¡ctico V");

 
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_widget_show (vbox);
 
     vbox = gtk_vbox_new (FALSE, 0);
     gtk_widget_show (vbox);


@@ -158,7 +158,7 @@ create_window (Dibujo* dibujo)
     gtk_widget_show (vbox_figura);
     gtk_container_add (GTK_CONTAINER (frame_figura), vbox_figura);
 
     gtk_widget_show (vbox_figura);
     gtk_container_add (GTK_CONTAINER (frame_figura), vbox_figura);
 

-    radiobutton_linea = gtk_radio_button_new_with_mnemonic (NULL, "LÃ\83­nea");
+    radiobutton_linea = gtk_radio_button_new_with_mnemonic (NULL, "LÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82­nea");

     gtk_widget_show (radiobutton_linea);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_linea, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_linea), radiobutton_linea_group);
     gtk_widget_show (radiobutton_linea);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_linea, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_linea), radiobutton_linea_group);


@@ -171,13 +171,13 @@ create_window (Dibujo* dibujo)
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_cuadrado), radiobutton_linea_group);
     radiobutton_linea_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_cuadrado));
 
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_cuadrado), radiobutton_linea_group);
     radiobutton_linea_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_cuadrado));
 

-    radiobutton_rectangulo = gtk_radio_button_new_with_mnemonic (NULL, "_RectÃ\83¡ngulo");
+    radiobutton_rectangulo = gtk_radio_button_new_with_mnemonic (NULL, "_RectÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82¡ngulo");

     gtk_widget_show (radiobutton_rectangulo);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_rectangulo, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_rectangulo), radiobutton_linea_group);
     radiobutton_linea_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_rectangulo));
 
     gtk_widget_show (radiobutton_rectangulo);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_rectangulo, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_rectangulo), radiobutton_linea_group);
     radiobutton_linea_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton_rectangulo));
 

-    radiobutton_circulo = gtk_radio_button_new_with_mnemonic (NULL, "CÃ\83­rc_ulo");
+    radiobutton_circulo = gtk_radio_button_new_with_mnemonic (NULL, "CÃ\83Â\83Ã\82Â\83Ã\83Â\82Ã\82­rc_ulo");

     gtk_widget_show (radiobutton_circulo);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_circulo, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_circulo), radiobutton_linea_group);
     gtk_widget_show (radiobutton_circulo);
     gtk_box_pack_start (GTK_BOX (vbox_figura), radiobutton_circulo, FALSE, FALSE, 0);
     gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_circulo), radiobutton_linea_group);


@@ -426,24 +426,36 @@ create_window (Dibujo* dibujo)
             (GtkAttachOptions) (0), 0, 0);
     gtk_widget_set_sensitive (spinbutton_radio, FALSE);
 
             (GtkAttachOptions) (0), 0, 0);
     gtk_widget_set_sensitive (spinbutton_radio, FALSE);
 

-    g_signal_connect ((gpointer) window, "delete_event",
+    g_signal_connect((gpointer) window, "delete_event",

             G_CALLBACK (on_window_delete_event),
             NULL);
             G_CALLBACK (on_window_delete_event),
             NULL);

-    g_signal_connect ((gpointer) drawingarea, "expose_event",
+    g_signal_connect((gpointer) drawingarea, "expose_event",

             G_CALLBACK (on_drawingarea_expose_event),
             dibujo);
             G_CALLBACK (on_drawingarea_expose_event),
             dibujo);

-    g_signal_connect ((gpointer) button_limpiar, "clicked",
+    g_signal_connect((gpointer) button_limpiar, "clicked",

             G_CALLBACK (on_button_borrar_clicked),
             dibujo);
             G_CALLBACK (on_button_borrar_clicked),
             dibujo);

-    g_signal_connect ((gpointer) button_actualizar, "clicked",
+    g_signal_connect((gpointer) button_actualizar, "clicked",

             G_CALLBACK (on_button_graficar_clicked),
             drawingarea);
             G_CALLBACK (on_button_graficar_clicked),
             drawingarea);

-    g_signal_connect ((gpointer) button_salir, "clicked",
+    g_signal_connect((gpointer) button_salir, "clicked",

             G_CALLBACK (on_button_salir_clicked),
             NULL);
             G_CALLBACK (on_button_salir_clicked),
             NULL);

-    g_signal_connect ((gpointer) button_agregar, "clicked",
+    g_signal_connect((gpointer) button_agregar, "clicked",

             G_CALLBACK (on_button_agregar_clicked),
             dibujo);
             G_CALLBACK (on_button_agregar_clicked),
             dibujo);

+    g_signal_connect((gpointer) radiobutton_linea, "toggled",
+            G_CALLBACK (on_radiobutton_linea_toggled),
+            NULL);
+    g_signal_connect((gpointer) radiobutton_cuadrado, "toggled",
+            G_CALLBACK (on_radiobutton_cuadrado_toggled),
+            NULL);
+    g_signal_connect((gpointer) radiobutton_rectangulo, "toggled",
+            G_CALLBACK (on_radiobutton_rectangulo_toggled),
+            NULL);
+    g_signal_connect((gpointer) radiobutton_circulo, "toggled",
+            G_CALLBACK (on_radiobutton_circulo_toggled),
+            NULL);

 
     /* Store pointers to all widgets, for use by lookup_widget(). */
     GLADE_HOOKUP_OBJECT_NO_REF (window, window, "window");
 
     /* Store pointers to all widgets, for use by lookup_widget(). */
     GLADE_HOOKUP_OBJECT_NO_REF (window, window, "window");