[glom] Avoid some use of (deprecated) Gtk::Alignment in code.



commit 299a9f519e4ee46d70d879543c9ebc2e24527f9e
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jun 3 09:34:51 2014 +0200

    Avoid some use of (deprecated) Gtk::Alignment in code.
    
    Use Gtk::Bin for placeholder parent widgets in the code instead,
    though they are still GtkAlignment in the Glade .ui files.

 data/ui/operator/dialog_find_id.glade              |    2 +-
 glom/box_reports.cc                                |    2 +-
 glom/mode_data/datawidget/dialog_choose_id.h       |    2 +-
 glom/mode_data/datawidget/dialog_new_record.h      |    2 +-
 glom/mode_data/flowtablewithfields.h               |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.h   |    4 ++--
 .../mode_design/print_layouts/box_print_layouts.cc |    2 +-
 glom/navigation/box_tables.cc                      |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/ui/operator/dialog_find_id.glade b/data/ui/operator/dialog_find_id.glade
index e9b6fc9..bd26e98 100644
--- a/data/ui/operator/dialog_find_id.glade
+++ b/data/ui/operator/dialog_find_id.glade
@@ -159,7 +159,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkAlignment" id="alignment_parent">
+                      <object class="GtkBin" id="alignment_parent">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/glom/box_reports.cc b/glom/box_reports.cc
index b282d9e..9c7f1d7 100644
--- a/glom/box_reports.cc
+++ b/glom/box_reports.cc
@@ -44,7 +44,7 @@ Box_Reports::Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
   builder->get_widget("button_cancel", pButtonCancel);
   set_button_cancel(*pButtonCancel);
 
-  Gtk::Alignment* pAligmentPlaceholder = 0;
+  Gtk::Bin* pAligmentPlaceholder = 0;
   builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
   pAligmentPlaceholder->add(m_AddDel);
 
diff --git a/glom/mode_data/datawidget/dialog_choose_id.h b/glom/mode_data/datawidget/dialog_choose_id.h
index ff082de..f0f00b7 100644
--- a/glom/mode_data/datawidget/dialog_choose_id.h
+++ b/glom/mode_data/datawidget/dialog_choose_id.h
@@ -69,7 +69,7 @@ private:
   Gtk::Box* m_pBox_QuickFind; //Only show this when in Find mode.
   Gtk::Entry* m_pEntry_QuickFind;
   Gtk::Button* m_pButton_QuickFind;
-  Gtk::Alignment* m_alignment_parent;
+  Gtk::Bin* m_alignment_parent;
 
   Glib::ustring m_table_name;
   Glib::ustring m_layout_platform;
diff --git a/glom/mode_data/datawidget/dialog_new_record.h b/glom/mode_data/datawidget/dialog_new_record.h
index 2d9fa5b..8fed745 100644
--- a/glom/mode_data/datawidget/dialog_new_record.h
+++ b/glom/mode_data/datawidget/dialog_new_record.h
@@ -53,7 +53,7 @@ private:
   void setup();
 
   Gtk::Label* m_label_table_name;
-  Gtk::Alignment* m_alignment_parent;
+  Gtk::Bin* m_alignment_parent;
 
   Glib::ustring m_table_name;
   Glib::ustring m_layout_platform;
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index e82d39e..da937b2 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -265,7 +265,7 @@ private:
   Box_Data_List_Related* create_related(const sharedptr<LayoutItem_Portal>& portal, bool show_title = true);
   Box_Data_Calendar_Related* create_related_calendar(const sharedptr<LayoutItem_CalendarPortal>& portal, 
bool show_title = true);
 
-  Gtk::Alignment* m_placeholder;
+  Gtk::Bin* m_placeholder;
 
   Glib::ustring m_table_name;
   bool m_find_mode;
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h 
b/glom/mode_design/fields/dialog_fielddefinition.h
index 1132c05..14a8e57 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -79,14 +79,14 @@ private:
   Gtk::Box* m_pBox_ValueTab;
 
   Gtk::RadioButton* m_pRadio_UserEntry;
-  Gtk::Alignment* m_pAlignment_UserEntry;
+  Gtk::Bin* m_pAlignment_UserEntry;
   Gtk::CheckButton* m_pCheck_Lookup;
   Gtk::Widget* m_pTable_Lookup; //So we can make it insensitive.
   ComboBox_Relationship* m_pCombo_LookupRelationship;
   Gtk::ComboBoxText* m_pCombo_LookupField;
 
   Gtk::RadioButton* m_pRadio_Calculate;
-  Gtk::Alignment* m_pAlignment_Calculate;
+  Gtk::Bin* m_pAlignment_Calculate;
   Gsv::View* m_pTextView_Calculation;
   Gtk::Button* m_pButton_EditCalculation;
 
diff --git a/glom/mode_design/print_layouts/box_print_layouts.cc 
b/glom/mode_design/print_layouts/box_print_layouts.cc
index 6e5bb75..a392666 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.cc
+++ b/glom/mode_design/print_layouts/box_print_layouts.cc
@@ -43,7 +43,7 @@ Box_Print_Layouts::Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr
   builder->get_widget("button_cancel", pButtonCancel);
   set_button_cancel(*pButtonCancel);
 
-  Gtk::Alignment* pAligmentPlaceholder = 0;
+  Gtk::Bin* pAligmentPlaceholder = 0;
   builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
   pAligmentPlaceholder->add(m_AddDel);
 
diff --git a/glom/navigation/box_tables.cc b/glom/navigation/box_tables.cc
index f4e002a..13f09cd 100644
--- a/glom/navigation/box_tables.cc
+++ b/glom/navigation/box_tables.cc
@@ -49,7 +49,7 @@ Box_Tables::Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
   // Set a name for the AddDel TreeView, so it can be accessed by LDTP
   m_AddDel.set_treeview_accessible_name("Tables");
 
-  Gtk::Alignment* pAligmentPlaceholder = 0;
+  Gtk::Bin* pAligmentPlaceholder = 0;
   builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
   pAligmentPlaceholder->add(m_AddDel);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]