Adjustmnets.

diff --git a/data/greptool/ui/greptool.ui b/data/greptool/ui/greptool.ui
index c537d550dd288ea264b48cba52d8b3eb1190fb53..5841df1a3369b83b4b0995d7cbd3a49a7d1d8cb3 100644 (file)
--- a/data/greptool/ui/greptool.ui
+++ b/data/greptool/ui/greptool.ui
@@ -513,31 +513,15 @@
           </packing>
         </child>
         <child>
-          <object class="GtkPaned" id="hpaned1">
+          <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <placeholder/>
             </child>
-            <child>
-              <object class="GtkPaned" id="vpaned1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">True</property>
@@ -831,20 +815,19 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label5">
+                      <object class="GtkSpinButton" id="spn_width">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Height</property>
-                        <property name="xalign">0</property>
+                        <property name="digits">2</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_width">
+                      <object class="GtkSpinButton" id="spn_height">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -852,19 +835,19 @@ You should have received a copy of the GNU General Public License along with Nau
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_height">
+                      <object class="GtkComboBox" id="cb_size_type">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="digits">2</property>
+                        <signal name="changed" handler="page_properties_on_cb_size_type_changed" swapped="no"/>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -876,20 +859,21 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="cb_size_type">
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <signal name="changed" handler="page_properties_on_cb_size_type_changed" swapped="no"/>
+                        <property name="label" translatable="yes">Height</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -901,9 +885,6 @@ You should have received a copy of the GNU General Public License along with Nau
                     <child>
                       <placeholder/>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -949,46 +930,31 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label14">
+                      <object class="GtkSpinButton" id="spn_margin_top">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Right</property>
-                        <property name="xalign">0</property>
+                        <property name="digits">2</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label15">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Bottom</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label16">
+                      <object class="GtkSpinButton" id="spn_margin_right">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">Left</property>
-                        <property name="xalign">0</property>
+                        <property name="digits">2</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">3</property>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_margin_top">
+                      <object class="GtkSpinButton" id="spn_margin_bottom">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -996,11 +962,11 @@ You should have received a copy of the GNU General Public License along with Nau
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_margin_right">
+                      <object class="GtkSpinButton" id="spn_margin_left">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1008,35 +974,47 @@ You should have received a copy of the GNU General Public License along with Nau
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_margin_bottom">
+                      <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="digits">2</property>
+                        <property name="label" translatable="yes">Bottom</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="spn_margin_left">
+                      <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="digits">2</property>
+                        <property name="label" translatable="yes">Left</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <object class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Right</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
                     </child>
                     <child>
                       <placeholder/>
@@ -1120,19 +1098,6 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label19">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">On First Page</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">4</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkSpinButton" id="spn_header_height1">
                         <property name="visible">True</property>
@@ -1154,10 +1119,23 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label19">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">On First Page</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <placeholder/>
                     </child>
@@ -1246,19 +1224,6 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label25">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">On First Page</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">4</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkSpinButton" id="spn_footer_height1">
                         <property name="visible">True</property>
@@ -1280,10 +1245,23 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label25">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">On First Page</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <placeholder/>
                     </child>
@@ -1406,30 +1384,6 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Connection String</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">SQL</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">2</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
@@ -1468,7 +1422,28 @@ You should have received a copy of the GNU General Public License along with Nau
                       </packing>
                     </child>
                     <child>
-                      <placeholder/>
+                      <object class="GtkLabel" id="label9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">SQL</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Connection String</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
                     </child>
                     <child>
                       <placeholder/>
@@ -1532,18 +1507,6 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label11">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">New Page After</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkCheckButton" id="chk_header_new_page_after">
                         <property name="visible">True</property>
@@ -1558,6 +1521,18 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">New Page After</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <placeholder/>
                     </child>
@@ -1617,18 +1592,6 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="label13">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">New Page Before</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkCheckButton" id="chk_footer_new_page_before">
                         <property name="visible">True</property>
@@ -1643,6 +1606,18 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label13">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">New Page Before</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <placeholder/>
                     </child>
@@ -2184,29 +2159,29 @@ You should have received a copy of the GNU General Public License along with Nau
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="label142">
+                                  <object class="GtkLabel" id="label141">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Bottom</property>
+                                    <property name="label" translatable="yes">Top</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">6</property>
-                                    <property name="top_attach">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="label141">
+                                  <object class="GtkLabel" id="label142">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">Top</property>
+                                    <property name="label" translatable="yes">Bottom</property>
                                     <property name="xalign">0</property>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">7</property>
-                                    <property name="top_attach">0</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -2313,7 +2288,7 @@ You should have received a copy of the GNU General Public License along with Nau
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                       </packing>
                     </child>
@@ -2945,29 +2920,29 @@ You should have received a copy of the GNU General Public License along with Nau
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label70">
+                              <object class="GtkLabel" id="label68">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Bottom</property>
+                                <property name="label" translatable="yes">Top</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">6</property>
-                                <property name="top_attach">1</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label68">
+                              <object class="GtkLabel" id="label70">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label" translatable="yes">Top</property>
+                                <property name="label" translatable="yes">Bottom</property>
                                 <property name="xalign">0</property>
                               </object>
                               <packing>
-                                <property name="left_attach">7</property>
-                                <property name="top_attach">0</property>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
                               </packing>
                             </child>
                             <child>

diff --git a/src/main.c b/src/main.c
index 7df028c1277f0024278aa47305b3d29e709ca8b4..4ca4e243dffb830196b2a3eeae0f0c04d49be3d1 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,7 @@ static gint image_counter;
 
 static GtkWidget *w;
 static GtkWidget *vbox;
+static GtkWidget *box1;
 static GtkWidget *mnu_file_save;
 static GtkWidget *mnu_file_save_as;
 static GtkWidget *mnu_file_close;
@@ -63,7 +64,7 @@ static GtkWidget *tbtn_save;
 static GtkWidget *tbtn_cut;
 static GtkWidget *tbtn_copy;
 static GtkWidget *tbtn_paste;
-static GtkWidget *handb_tb_objects;
+static GtkWidget *tbtn_objects;
 static GtkWidget *rtbtn_select;
 static GtkWidget *rtbtn_text;
 static GtkWidget *rtbtn_line;
@@ -109,7 +110,7 @@ menu_toolbar_sensitivity ()
        gtk_widget_set_sensitive (tbtn_copy, sens);
        gtk_widget_set_sensitive (tbtn_paste, sens);
 
-       gtk_widget_set_sensitive (handb_tb_objects, sens);
+       gtk_widget_set_sensitive (tbtn_objects, sens);
 }
 
 static void
@@ -180,8 +181,7 @@ report_new ()
        g_signal_connect (grpt_canvas, "object-removed", G_CALLBACK (report_on_canvas_object_removed), NULL);
        g_signal_connect (grpt_canvas, "selection-changed", G_CALLBACK (report_on_canvas_selection_changed), NULL);
 
-       gtk_container_add (GTK_CONTAINER (vbox), canvas_widget);
-       gtk_box_reorder_child (GTK_BOX (vbox), canvas_widget, 3);
+       gtk_box_pack_start (GTK_BOX (box1), canvas_widget, TRUE, TRUE, 0);
 
        gtk_widget_show_all (canvas_widget);
 
@@ -218,8 +218,7 @@ report_open_from_file (const gchar *filename)
        g_signal_connect (grpt_canvas, "object-removed", G_CALLBACK (report_on_canvas_object_removed), NULL);
        g_signal_connect (grpt_canvas, "selection-changed", G_CALLBACK (report_on_canvas_selection_changed), NULL);
 
-       gtk_container_add (GTK_CONTAINER (vbox), canvas_widget);
-       gtk_box_reorder_child (GTK_BOX (vbox), canvas_widget, 3);
+       gtk_box_pack_start (GTK_BOX (box1), canvas_widget, TRUE, TRUE, 0);
 
        gtk_widget_show_all (canvas_widget);
 
@@ -402,7 +401,7 @@ on_mnu_help_about_activate (GtkMenuItem *menuitem,
                                                                    NULL),
                                                       "|", -1),
                                                                                NULL);
-       GtkWidget *diag = gtk_builder_get_object (glaAbout, "diag_about");
+       GtkWidget *diag = GTK_WIDGET (gtk_builder_get_object (glaAbout, "diag_about"));
 
        gtk_dialog_run (GTK_DIALOG (diag));
        gtk_widget_destroy (diag);
@@ -548,28 +547,29 @@ main (int argc, char **argv)
                                                                                NULL);
        gtk_builder_connect_signals (glaMain, NULL);
 
-       w = gtk_builder_get_object (glaMain, "w_main");
-
-       vbox = gtk_builder_get_object (glaMain, "vbox");
-
-       mnu_file_save = gtk_builder_get_object (glaMain, "mnu_file_save");
-       mnu_file_save_as = gtk_builder_get_object (glaMain, "mnu_file_save_as");
-       mnu_file_close = gtk_builder_get_object (glaMain, "mnu_file_close");
-       mnu_edit = gtk_builder_get_object (glaMain, "mnu_edit");
-       mnu_view = gtk_builder_get_object (glaMain, "mnu_view");
-
-       tbtn_save = gtk_builder_get_object (glaMain, "tbtn_save");
-       tbtn_cut = gtk_builder_get_object (glaMain, "tbtn_cut");
-       tbtn_copy = gtk_builder_get_object (glaMain, "tbtn_copy");
-       tbtn_paste = gtk_builder_get_object (glaMain, "tbtn_paste");
-
-       handb_tb_objects = gtk_builder_get_object (glaMain, "handb_tb_objects");
-       rtbtn_select = gtk_builder_get_object (glaMain, "rtbtn_select");
-       rtbtn_text = gtk_builder_get_object (glaMain, "rtbtn_text");
-       rtbtn_line = gtk_builder_get_object (glaMain, "rtbtn_line");
-       rtbtn_rect = gtk_builder_get_object (glaMain, "rtbtn_rect");
-       rtbtn_ellipse = gtk_builder_get_object (glaMain, "rtbtn_ellipse");
-       rtbtn_image = gtk_builder_get_object (glaMain, "rtbtn_image");
+       w = GTK_WIDGET (gtk_builder_get_object (glaMain, "w_main"));
+
+       vbox = GTK_WIDGET (gtk_builder_get_object (glaMain, "vbox"));
+       box1 = GTK_WIDGET (gtk_builder_get_object (glaMain, "box1"));
+
+       mnu_file_save = GTK_WIDGET (gtk_builder_get_object (glaMain, "mnu_file_save"));
+       mnu_file_save_as = GTK_WIDGET (gtk_builder_get_object (glaMain, "mnu_file_save_as"));
+       mnu_file_close = GTK_WIDGET (gtk_builder_get_object (glaMain, "mnu_file_close"));
+       mnu_edit = GTK_WIDGET (gtk_builder_get_object (glaMain, "mnu_edit"));
+       mnu_view = GTK_WIDGET (gtk_builder_get_object (glaMain, "mnu_view"));
+
+       tbtn_save = GTK_WIDGET (gtk_builder_get_object (glaMain, "tbtn_save"));
+       tbtn_cut = GTK_WIDGET (gtk_builder_get_object (glaMain, "tbtn_cut"));
+       tbtn_copy = GTK_WIDGET (gtk_builder_get_object (glaMain, "tbtn_copy"));
+       tbtn_paste = GTK_WIDGET (gtk_builder_get_object (glaMain, "tbtn_paste"));
+
+       tbtn_objects = GTK_WIDGET (gtk_builder_get_object (glaMain, "toolbar2"));
+       rtbtn_select = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_select"));
+       rtbtn_text = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_text"));
+       rtbtn_line = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_line"));
+       rtbtn_rect = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_rect"));
+       rtbtn_ellipse = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_ellipse"));
+       rtbtn_image = GTK_WIDGET (gtk_builder_get_object (glaMain, "rtbtn_image"));
 
        image = gtk_image_new_from_file (ICONSDIR "/selector.png");
        gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (rtbtn_select), image);

diff --git a/src/object_properties.c b/src/object_properties.c
index 3e3f7b9591c831bdd308f5de5fccf2458b622678..fdbbc04b91d06f18876ddf2c0ea3bd3a18c23d8a 100644 (file)
--- a/src/object_properties.c
+++ b/src/object_properties.c
@@ -302,16 +302,16 @@ GRptObjectProperties
 
        gtk_builder_connect_signals (gla, NULL);
 
-       priv->w = gtk_builder_get_object (gla, "w_obj_properties");
-       priv->vbox = gtk_builder_get_object (gla, "vbox");
+       priv->w = GTK_WIDGET (gtk_builder_get_object (gla, "w_obj_properties"));
+       priv->vbox = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
 
        /* common */
-       priv->txt_name = gtk_builder_get_object (gla, "txt_name");
-       priv->spn_x = gtk_builder_get_object (gla, "spn_x");
-       priv->spn_y = gtk_builder_get_object (gla, "spn_y");
-       priv->spn_width = gtk_builder_get_object (gla, "spn_width");
-       priv->spn_height = gtk_builder_get_object (gla, "spn_height");
-       priv->spn_rotation = gtk_builder_get_object (gla, "spn_rotation");
+       priv->txt_name = GTK_WIDGET (gtk_builder_get_object (gla, "txt_name"));
+       priv->spn_x = GTK_WIDGET (gtk_builder_get_object (gla, "spn_x"));
+       priv->spn_y = GTK_WIDGET (gtk_builder_get_object (gla, "spn_y"));
+       priv->spn_width = GTK_WIDGET (gtk_builder_get_object (gla, "spn_width"));
+       priv->spn_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_height"));
+       priv->spn_rotation = GTK_WIDGET (gtk_builder_get_object (gla, "spn_rotation"));
 
        g_signal_connect (G_OBJECT (priv->txt_name), "changed",
                                          G_CALLBACK (on_txt_name_changed), (gpointer)obj_prop);
@@ -327,29 +327,29 @@ GRptObjectProperties
                                          G_CALLBACK (on_spn_rotation_value_changed), (gpointer)obj_prop);
 
        /* text */
-       priv->vbox_text = gtk_builder_get_object (gla, "vbox");
+       priv->vbox_text = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
        g_object_ref (priv->vbox_text);
        gtk_widget_unparent (priv->vbox_text);
-       priv->spn_text_border_width_top = gtk_builder_get_object (gla, "spn_text_border_width_top");
-       priv->spn_text_border_width_right = gtk_builder_get_object (gla, "spn_text_border_width_right");
-       priv->spn_text_border_width_bottom = gtk_builder_get_object (gla, "spn_text_border_width_bottom");
-       priv->spn_text_border_width_left = gtk_builder_get_object (gla, "spn_text_border_width_left");
-       priv->cbtn_text_border_color_top = gtk_builder_get_object (gla, "cbtn_text_border_color_top");
-       priv->cbtn_text_border_color_right = gtk_builder_get_object (gla, "cbtn_text_border_color_right");
-       priv->cbtn_text_border_color_bottom = gtk_builder_get_object (gla, "cbtn_text_border_color_bottom");
-       priv->cbtn_text_border_color_left = gtk_builder_get_object (gla, "cbtn_text_border_color_left");
-       priv->fbtn_text_font = gtk_builder_get_object (gla, "fbtn_text_font");
-       priv->chk_text_font_strike = gtk_builder_get_object (gla, "chk_text_font_strike");
-       priv->cbtn_text_font_color = gtk_builder_get_object (gla, "cbtn_text_font_color");
-       priv->cb_text_alignment_h = gtk_builder_get_object (gla, "cb_text_alignment_h");
-       priv->cb_text_alignment_v = gtk_builder_get_object (gla, "cb_text_alignment_v");
-       priv->txtv_text_source = gtk_builder_get_object (gla, "txtv_text_source");
+       priv->spn_text_border_width_top = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_border_width_top"));
+       priv->spn_text_border_width_right = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_border_width_right"));
+       priv->spn_text_border_width_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_border_width_bottom"));
+       priv->spn_text_border_width_left = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_border_width_left"));
+       priv->cbtn_text_border_color_top = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_border_color_top"));
+       priv->cbtn_text_border_color_right = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_border_color_right"));
+       priv->cbtn_text_border_color_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_border_color_bottom"));
+       priv->cbtn_text_border_color_left = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_border_color_left"));
+       priv->fbtn_text_font = GTK_WIDGET (gtk_builder_get_object (gla, "fbtn_text_font"));
+       priv->chk_text_font_strike = GTK_WIDGET (gtk_builder_get_object (gla, "chk_text_font_strike"));
+       priv->cbtn_text_font_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_font_color"));
+       priv->cb_text_alignment_h = GTK_WIDGET (gtk_builder_get_object (gla, "cb_text_alignment_h"));
+       priv->cb_text_alignment_v = GTK_WIDGET (gtk_builder_get_object (gla, "cb_text_alignment_v"));
+       priv->txtv_text_source = GTK_WIDGET (gtk_builder_get_object (gla, "txtv_text_source"));
        priv->buf_text_source = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->txtv_text_source));
-       priv->cbtn_text_back_color = gtk_builder_get_object (gla, "cbtn_text_back_color");
-       priv->spn_text_padd_top = gtk_builder_get_object (gla, "spn_text_padd_top");
-       priv->spn_text_padd_right = gtk_builder_get_object (gla, "spn_text_padd_right");
-       priv->spn_text_padd_bottom = gtk_builder_get_object (gla, "spn_text_padd_bottom");
-       priv->spn_text_padd_left = gtk_builder_get_object (gla, "spn_text_padd_left");
+       priv->cbtn_text_back_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_text_back_color"));
+       priv->spn_text_padd_top = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_padd_top"));
+       priv->spn_text_padd_right = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_padd_right"));
+       priv->spn_text_padd_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_padd_bottom"));
+       priv->spn_text_padd_left = GTK_WIDGET (gtk_builder_get_object (gla, "spn_text_padd_left"));
 
        priv->lstore_text_alignment_h = gtk_list_store_new (ALIGN_COLS,
                                                                                                                G_TYPE_INT,
@@ -453,11 +453,11 @@ GRptObjectProperties
                                          G_CALLBACK (on_spn_text_padd_left_value_changed), (gpointer)obj_prop);
 
        /* line */
-       priv->vbox_line = gtk_builder_get_object (gla, "vbox");
+       priv->vbox_line = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
        g_object_ref (priv->vbox_line);
        gtk_widget_unparent (priv->vbox_line);
-       priv->spn_line_stroke_width = gtk_builder_get_object (gla, "spn_line_stroke_width");
-       priv->cbtn_line_stroke_color = gtk_builder_get_object (gla, "cbtn_line_stroke_color");
+       priv->spn_line_stroke_width = GTK_WIDGET (gtk_builder_get_object (gla, "spn_line_stroke_width"));
+       priv->cbtn_line_stroke_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_line_stroke_color"));
 
        g_signal_connect (G_OBJECT (priv->spn_line_stroke_width), "value-changed",
                                          G_CALLBACK (on_spn_line_stroke_width_value_changed), (gpointer)obj_prop);
@@ -465,12 +465,12 @@ GRptObjectProperties
                                          G_CALLBACK (on_cbtn_line_stroke_color_color_set), (gpointer)obj_prop);
 
        /* rectangle */
-       priv->vbox_rect = gtk_builder_get_object (gla, "vbox");
+       priv->vbox_rect = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
        g_object_ref (priv->vbox_rect);
        gtk_widget_unparent (priv->vbox_rect);
-       priv->spn_rect_stroke_width = gtk_builder_get_object (gla, "spn_rect_stroke_width");
-       priv->cbtn_rect_stroke_color = gtk_builder_get_object (gla, "cbtn_rect_stroke_color");
-       priv->cbtn_rect_fill_color = gtk_builder_get_object (gla, "cbtn_rect_fill_color");
+       priv->spn_rect_stroke_width = GTK_WIDGET (gtk_builder_get_object (gla, "spn_rect_stroke_width"));
+       priv->cbtn_rect_stroke_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_rect_stroke_color"));
+       priv->cbtn_rect_fill_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_rect_fill_color"));
 
        g_signal_connect (G_OBJECT (priv->spn_rect_stroke_width), "value-changed",
                                          G_CALLBACK (on_spn_rect_stroke_width_value_changed), (gpointer)obj_prop);
@@ -480,12 +480,12 @@ GRptObjectProperties
                                          G_CALLBACK (on_cbtn_rect_fill_color_color_set), (gpointer)obj_prop);
 
        /* ellipse */
-       priv->vbox_ellipse = gtk_builder_get_object (gla, "vbox");
+       priv->vbox_ellipse = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
        g_object_ref (priv->vbox_ellipse);
        gtk_widget_unparent (priv->vbox_ellipse);
-       priv->spn_ellipse_stroke_width = gtk_builder_get_object (gla, "spn_ellipse_stroke_width");
-       priv->cbtn_ellipse_stroke_color = gtk_builder_get_object (gla, "cbtn_ellipse_stroke_color");
-       priv->cbtn_ellipse_fill_color = gtk_builder_get_object (gla, "cbtn_ellipse_fill_color");
+       priv->spn_ellipse_stroke_width = GTK_WIDGET (gtk_builder_get_object (gla, "spn_ellipse_stroke_width"));
+       priv->cbtn_ellipse_stroke_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_ellipse_stroke_color"));
+       priv->cbtn_ellipse_fill_color = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_ellipse_fill_color"));
 
        g_signal_connect (G_OBJECT (priv->spn_ellipse_stroke_width), "value-changed",
                                          G_CALLBACK (on_spn_ellipse_stroke_width_value_changed), (gpointer)obj_prop);
@@ -495,18 +495,18 @@ GRptObjectProperties
                                          G_CALLBACK (on_cbtn_ellipse_fill_color_color_set), (gpointer)obj_prop);
 
        /* image */
-       priv->vbox_image = gtk_builder_get_object (gla, "vbox");
+       priv->vbox_image = GTK_WIDGET (gtk_builder_get_object (gla, "vbox"));
        g_object_ref (priv->vbox_image);
        gtk_widget_unparent (priv->vbox_image);
-       priv->spn_image_border_width_top = gtk_builder_get_object (gla, "spn_image_border_width_top");
-       priv->spn_image_border_width_right = gtk_builder_get_object (gla, "spn_image_border_width_right");
-       priv->spn_image_border_width_bottom = gtk_builder_get_object (gla, "spn_image_border_width_bottom");
-       priv->spn_image_border_width_left = gtk_builder_get_object (gla, "spn_image_border_width_left");
-       priv->cbtn_image_border_color_top = gtk_builder_get_object (gla, "cbtn_image_border_color_top");
-       priv->cbtn_image_border_color_right = gtk_builder_get_object (gla, "cbtn_image_border_color_right");
-       priv->cbtn_image_border_color_bottom = gtk_builder_get_object (gla, "cbtn_image_border_color_bottom");
-       priv->cbtn_image_border_color_left = gtk_builder_get_object (gla, "cbtn_image_border_color_left");
-       priv->cb_image_adapt = gtk_builder_get_object (gla, "cb_image_adapt");
+       priv->spn_image_border_width_top = GTK_WIDGET (gtk_builder_get_object (gla, "spn_image_border_width_top"));
+       priv->spn_image_border_width_right = GTK_WIDGET (gtk_builder_get_object (gla, "spn_image_border_width_right"));
+       priv->spn_image_border_width_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "spn_image_border_width_bottom"));
+       priv->spn_image_border_width_left = GTK_WIDGET (gtk_builder_get_object (gla, "spn_image_border_width_left"));
+       priv->cbtn_image_border_color_top = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_image_border_color_top"));
+       priv->cbtn_image_border_color_right = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_image_border_color_right"));
+       priv->cbtn_image_border_color_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_image_border_color_bottom"));
+       priv->cbtn_image_border_color_left = GTK_WIDGET (gtk_builder_get_object (gla, "cbtn_image_border_color_left"));
+       priv->cb_image_adapt = GTK_WIDGET (gtk_builder_get_object (gla, "cb_image_adapt"));
 
        priv->lstore_image_adapt = gtk_list_store_new (ADAPT_COLS,
                                                       G_TYPE_UINT,

diff --git a/src/objects_tree.c b/src/objects_tree.c
index 278e92b2c8158c4eb0b58091ee4f1e0341e747b0..76aafca478558c956052d9649e3f228ba761f5fc 100644 (file)
--- a/src/objects_tree.c
+++ b/src/objects_tree.c
@@ -312,7 +312,7 @@ grpt_objects_tree_find_item (GRptObjectsTree *grpt_objects_tree,
 }
 
 /* CALLBACKS */
-void
+G_MODULE_EXPORT void
 grpt_objects_tree_on_tr_objects_tree_row_activated (GtkTreeView *treeview,
                                                     GtkTreePath *path,
                                                     GtkTreeViewColumn *col,
@@ -379,8 +379,8 @@ GRptObjectsTree
        gtk_builder_add_objects_from_file (gla, GLADEDIR "/greptool.ui", g_strsplit (g_strconcat ("w_objects_tree",
                                                                    NULL),
                                                       "|", -1), NULL);
-       priv->w_tree = gtk_builder_get_object (gla, "w_objects_tree");
-       priv->tr_objects = gtk_builder_get_object (gla, "tr_objects_tree");
+       priv->w_tree = GTK_WIDGET (gtk_builder_get_object (gla, "w_objects_tree"));
+       priv->tr_objects = GTK_WIDGET (gtk_builder_get_object (gla, "tr_objects_tree"));
 
        gtk_builder_connect_signals (gla, NULL);
 

diff --git a/src/page_properties.c b/src/page_properties.c
index 6eaf69e5240f93ba0521a3ebb647376cb3db3481..991a07dec7b2edf3c8ed35e507df7c817df0c625 100644 (file)
--- a/src/page_properties.c
+++ b/src/page_properties.c
@@ -144,7 +144,7 @@ page_properties_load ()
                }
 }
 
-void
+G_MODULE_EXPORT void
 page_properties_on_cb_size_type_changed (GtkComboBox *widget,
                                          gpointer user_data)
 {
@@ -159,28 +159,28 @@ page_properties_on_cb_size_type_changed (GtkComboBox *widget,
                }
 }
 
-void
+G_MODULE_EXPORT void
 page_properties_on_chk_header_toggled (GtkToggleButton *togglebutton,
                                        gpointer user_data)
 {
        page_properties_set_header_sensibility ();
 }
 
-void
+G_MODULE_EXPORT void
 page_properties_on_chk_footer_toggled (GtkToggleButton *togglebutton,
                                        gpointer user_data)
 {
        page_properties_set_footer_sensibility ();
 }
 
-void
+G_MODULE_EXPORT void
 page_properties_on_btn_cancel_clicked (GtkButton *button,
                                        gpointer user_data)
 {
        gtk_widget_destroy (w_prop);
 }
 
-void
+G_MODULE_EXPORT void
 page_properties_on_btn_ok_clicked (GtkButton *button,
                                    gpointer user_data)
 {
@@ -229,27 +229,27 @@ page_properties (GRptCanvas *grpt_canvas)
                                           g_strsplit (g_strconcat ("w_page_properties",
                                                                    NULL),
                                                       "|", -1), NULL);
-       w_prop = gtk_builder_get_object (gla, "w_page_properties");
+       w_prop = GTK_WIDGET (gtk_builder_get_object (gla, "w_page_properties"));
 
        grpt_canvas_ = grpt_canvas;
 
        gtk_builder_connect_signals (gla, NULL);
 
-       cb_size_type = gtk_builder_get_object (gla, "cb_size_type");
-       spn_height = gtk_builder_get_object (gla, "spn_height");
-       spn_width = gtk_builder_get_object (gla, "spn_width");
-       spn_margin_top = gtk_builder_get_object (gla, "spn_margin_top");
-       spn_margin_right = gtk_builder_get_object (gla, "spn_margin_right");
-       spn_margin_bottom = gtk_builder_get_object (gla, "spn_margin_bottom");
-       spn_margin_left = gtk_builder_get_object (gla, "spn_margin_left");
-       chk_header = gtk_builder_get_object (gla, "chk_header");
-       spn_header_height = gtk_builder_get_object (gla, "spn_header_height");
-       chk_header_first_page = gtk_builder_get_object (gla, "chk_header_first_page");
-       chk_header_last_page = gtk_builder_get_object (gla, "chk_header_last_page");
-       chk_footer = gtk_builder_get_object (gla, "chk_footer");
-       spn_footer_height = gtk_builder_get_object (gla, "spn_footer_height");
-       chk_footer_first_page = gtk_builder_get_object (gla, "chk_footer_first_page");
-       chk_footer_last_page = gtk_builder_get_object (gla, "chk_footer_last_page");
+       cb_size_type = GTK_WIDGET (gtk_builder_get_object (gla, "cb_size_type"));
+       spn_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_height"));
+       spn_width = GTK_WIDGET (gtk_builder_get_object (gla, "spn_width"));
+       spn_margin_top = GTK_WIDGET (gtk_builder_get_object (gla, "spn_margin_top"));
+       spn_margin_right = GTK_WIDGET (gtk_builder_get_object (gla, "spn_margin_right"));
+       spn_margin_bottom = GTK_WIDGET (gtk_builder_get_object (gla, "spn_margin_bottom"));
+       spn_margin_left = GTK_WIDGET (gtk_builder_get_object (gla, "spn_margin_left"));
+       chk_header = GTK_WIDGET (gtk_builder_get_object (gla, "chk_header"));
+       spn_header_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_header_height"));
+       chk_header_first_page = GTK_WIDGET (gtk_builder_get_object (gla, "chk_header_first_page"));
+       chk_header_last_page = GTK_WIDGET (gtk_builder_get_object (gla, "chk_header_last_page"));
+       chk_footer = GTK_WIDGET (gtk_builder_get_object (gla, "chk_footer"));
+       spn_footer_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_footer_height"));
+       chk_footer_first_page = GTK_WIDGET (gtk_builder_get_object (gla, "chk_footer_first_page"));
+       chk_footer_last_page = GTK_WIDGET (gtk_builder_get_object (gla, "chk_footer_last_page"));
 
        page_properties_set_size_sensibility ();
        page_properties_set_header_sensibility ();

diff --git a/src/report_properties.c b/src/report_properties.c
index f0fed40100402c2b8045a0cd6065945a63bf3e8b..6ad938ccedc46a63422caafdad012dc97a7b2893 100644 (file)
--- a/src/report_properties.c
+++ b/src/report_properties.c
@@ -140,28 +140,28 @@ report_properties_set_footer_sensivity ()
        gtk_widget_set_sensitive (chk_footer_new_page_before, sens);
 }
 
-void
+G_MODULE_EXPORT void
 report_properties_on_chk_header_toggled (GtkToggleButton *togglebutton,
                                          gpointer user_data)
 {
        report_properties_set_header_sensivity ();
 }
 
-void
+G_MODULE_EXPORT void
 report_properties_on_chk_footer_toggled (GtkToggleButton *togglebutton,
                                          gpointer user_data)
 {
        report_properties_set_footer_sensivity ();
 }
 
-void
+G_MODULE_EXPORT void
 report_properties_on_btn_cancel_clicked (GtkButton *button,
                                          gpointer user_data)
 {
        gtk_widget_destroy (w_prop);
 }
 
-void
+G_MODULE_EXPORT void
 report_properties_on_btn_ok_clicked (GtkButton *button,
                                      gpointer user_data)
 {
@@ -224,16 +224,16 @@ report_properties (RptReport *rpt_report)
                                           g_strsplit (g_strconcat ("w_report_properties",
                                                                    NULL),
                                                       "|", -1), NULL);
-       w_prop = gtk_builder_get_object (gla, "w_report_properties");
-       cb_providers = gtk_builder_get_object (gla, "cb_providers");
-       txt_cnc_string = gtk_builder_get_object (gla, "txt_cnc_string");
-       txtv_sql = gtk_builder_get_object (gla, "txtv_sql");
-       chk_header = gtk_builder_get_object (gla, "chk_header");
-       spn_header_height = gtk_builder_get_object (gla, "spn_header_height");
-       chk_header_new_page_after = gtk_builder_get_object (gla, "chk_header_new_page_after");
-       chk_footer = gtk_builder_get_object (gla, "chk_footer");
-       spn_footer_height = gtk_builder_get_object (gla, "spn_footer_height");
-       chk_footer_new_page_before = gtk_builder_get_object (gla, "chk_footer_new_page_before");
+       w_prop = GTK_WIDGET (gtk_builder_get_object (gla, "w_report_properties"));
+       cb_providers = GTK_WIDGET (gtk_builder_get_object (gla, "cb_providers"));
+       txt_cnc_string = GTK_WIDGET (gtk_builder_get_object (gla, "txt_cnc_string"));
+       txtv_sql = GTK_WIDGET (gtk_builder_get_object (gla, "txtv_sql"));
+       chk_header = GTK_WIDGET (gtk_builder_get_object (gla, "chk_header"));
+       spn_header_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_header_height"));
+       chk_header_new_page_after = GTK_WIDGET (gtk_builder_get_object (gla, "chk_header_new_page_after"));
+       chk_footer = GTK_WIDGET (gtk_builder_get_object (gla, "chk_footer"));
+       spn_footer_height = GTK_WIDGET (gtk_builder_get_object (gla, "spn_footer_height"));
+       chk_footer_new_page_before = GTK_WIDGET (gtk_builder_get_object (gla, "chk_footer_new_page_before"));
 
        rpt_report_ = rpt_report;