Changeset 177


Ignore:
Timestamp:
Aug 28, 2010, 7:19:13 PM (10 years ago)
Author:
sam
Message:

Minor simplification to the GTK exit handling.

Location:
trunk/src/gtk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gtk/editor.xml

    r170 r177  
    2323                      <object class="GtkImageMenuItem" id="imagemenuitem1">
    2424                        <property name="visible">True</property>
     25                        <property name="related_action">action_new</property>
    2526                        <property name="use_action_appearance">True</property>
    26                         <property name="related_action">action_new</property>
    2727                        <property name="use_underline">True</property>
    2828                        <property name="use_stock">True</property>
     
    3232                      <object class="GtkImageMenuItem" id="imagemenuitem2">
    3333                        <property name="visible">True</property>
     34                        <property name="related_action">action_open</property>
    3435                        <property name="use_action_appearance">True</property>
    35                         <property name="related_action">action_open</property>
    3636                        <property name="use_underline">True</property>
    3737                        <property name="use_stock">True</property>
     
    6767                        <property name="always_show_image">True</property>
    6868                        <signal name="activate" handler="gtk_main_quit"/>
    69                         <signal name="activate" handler="gtk_true"/>
    7069                      </object>
    7170                    </child>
     
    159158              <object class="GtkToolButton" id="toolbutton2">
    160159                <property name="visible">True</property>
     160                <property name="related_action">action_new</property>
    161161                <property name="use_action_appearance">True</property>
    162                 <property name="related_action">action_new</property>
    163162                <property name="label" translatable="yes">toolbutton</property>
    164163                <property name="use_underline">True</property>
     
    172171              <object class="GtkToolButton" id="toolbutton1">
    173172                <property name="visible">True</property>
     173                <property name="related_action">action_open</property>
    174174                <property name="use_action_appearance">True</property>
    175                 <property name="related_action">action_open</property>
    176175                <property name="label" translatable="yes">Open...</property>
    177176                <property name="use_underline">True</property>
     
    185184              <object class="GtkToolButton" id="toolbutton4">
    186185                <property name="visible">True</property>
     186                <property name="related_action">action_save</property>
    187187                <property name="use_action_appearance">True</property>
    188                 <property name="related_action">action_save</property>
    189188                <property name="label" translatable="yes">Save</property>
    190189                <property name="use_underline">True</property>
  • trunk/src/gtk/glmapview.cpp

    r170 r177  
    5151     * the timeout value. */
    5252    g_idle_add((GSourceFunc)IdleTickSignal, this);
     53
     54    /* We must divert gtk_main_quit() to release our resources when the
     55     * GL widget is still realised. We'll call gtk_main_quit() when we
     56     * are sure that everything has been cleaned. */
    5357    gtk_quit_add(0, (GtkFunction)ShutdownSignal, this);
    5458
Note: See TracChangeset for help on using the changeset viewer.