GNOME.org
 

glom r1944 - in trunk: . glom glom/layout_item_dialogs glom/libglom glom/libglom/connectionpool_backends glom/libglom/data_structure glom/libglom/data_structure/layout glom/libglom/data_structure/layout/report_parts glom/libglom/document glom/mode_data glom/mode_design glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/mode_find glom/navigation glom/relationships_overview glom/reports glom/translation glom/utility_widgets glom/utility_widgets/adddel glom/utility_widgets/canvas glom/utility_widgets/cellrendererlist glom/utility_widgets/db_adddel

Author: murrayc
Date: Mon Mar  2 18:47:54 2009
New Revision: 1944
URL: http://svn.gnome.org/viewvc/glom?rev=1944&view=rev

Log:
2009-03-02  Murray Cumming  <murrayc murrayc com>

* Many .h files: Changed many protected to private to make the API 
clearer. This is particularly important for libglom, as I start 
thinking of wrapping the API for Java/Web.

Modified:
   trunk/ChangeLog
   trunk/glom/application.h
   trunk/glom/base_db.cc
   trunk/glom/box_reports.h
   trunk/glom/box_withbuttons.h
   trunk/glom/combobox_fields.h
   trunk/glom/combobox_relationship.h
   trunk/glom/dialog_connection.h
   trunk/glom/dialog_database_preferences.h
   trunk/glom/dialog_existing_or_new.cc
   trunk/glom/dialog_existing_or_new.h
   trunk/glom/dialog_import_csv.h
   trunk/glom/dialog_import_csv_progress.h
   trunk/glom/dialog_invalid_data.h
   trunk/glom/dialog_new_self_hosted_connection.h
   trunk/glom/filechooser_export.h
   trunk/glom/glom_privs.h
   trunk/glom/layout_item_dialogs/box_formatting.h
   trunk/glom/layout_item_dialogs/combo_summarytype.h
   trunk/glom/layout_item_dialogs/comboentry_borderwidth.h
   trunk/glom/layout_item_dialogs/dialog_buttonscript.h
   trunk/glom/layout_item_dialogs/dialog_field_layout.h
   trunk/glom/layout_item_dialogs/dialog_field_summary.h
   trunk/glom/layout_item_dialogs/dialog_group_by.h
   trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
   trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h
   trunk/glom/layout_item_dialogs/dialog_imageobject.h
   trunk/glom/layout_item_dialogs/dialog_notebook.h
   trunk/glom/layout_item_dialogs/dialog_textobject.h
   trunk/glom/libglom/appstate.h
   trunk/glom/libglom/connectionpool.h
   trunk/glom/libglom/connectionpool_backends/backend.h
   trunk/glom/libglom/connectionpool_backends/postgres.h
   trunk/glom/libglom/connectionpool_backends/postgres_central.h
   trunk/glom/libglom/connectionpool_backends/postgres_self.h
   trunk/glom/libglom/connectionpool_backends/sqlite.h
   trunk/glom/libglom/data_structure/field.h
   trunk/glom/libglom/data_structure/fieldtypes.h
   trunk/glom/libglom/data_structure/layout/custom_title.h
   trunk/glom/libglom/data_structure/layout/fieldformatting.h
   trunk/glom/libglom/data_structure/layout/layoutgroup.h
   trunk/glom/libglom/data_structure/layout/layoutitem.h
   trunk/glom/libglom/data_structure/layout/layoutitem_button.h
   trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc
   trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.h
   trunk/glom/libglom/data_structure/layout/layoutitem_field.cc
   trunk/glom/libglom/data_structure/layout/layoutitem_field.h
   trunk/glom/libglom/data_structure/layout/layoutitem_image.h
   trunk/glom/libglom/data_structure/layout/layoutitem_line.h
   trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h
   trunk/glom/libglom/data_structure/layout/layoutitem_placeholder.h
   trunk/glom/libglom/data_structure/layout/layoutitem_portal.cc
   trunk/glom/libglom/data_structure/layout/layoutitem_portal.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h
   trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
   trunk/glom/libglom/data_structure/layout/usesrelationship.h
   trunk/glom/libglom/data_structure/print_layout.h
   trunk/glom/libglom/data_structure/relationship.h
   trunk/glom/libglom/data_structure/report.h
   trunk/glom/libglom/data_structure/translatable_item.h
   trunk/glom/libglom/dialog_progress_creating.h
   trunk/glom/libglom/document/document_glom.h
   trunk/glom/libglom/sharedptr.h
   trunk/glom/libglom/test_avahi_publisher.cc
   trunk/glom/libglom/utils.cc
   trunk/glom/mode_data/box_data_calendar_related.h
   trunk/glom/mode_data/dialog_choose_field.h
   trunk/glom/mode_data/dialog_choose_relationship.h
   trunk/glom/mode_data/dialog_layout_calendar_related.h
   trunk/glom/mode_data/dialog_layout_export.h
   trunk/glom/mode_data/dialog_layout_list.h
   trunk/glom/mode_data/flowtablewithfields.h
   trunk/glom/mode_data/treestore_layout.h
   trunk/glom/mode_design/box_db_table_relationships.h
   trunk/glom/mode_design/dialog_add_related_table.h
   trunk/glom/mode_design/dialog_design.h
   trunk/glom/mode_design/dialog_fields.h
   trunk/glom/mode_design/dialog_relationships.h
   trunk/glom/mode_design/fields/box_db_table_definition.h
   trunk/glom/mode_design/fields/combo_fieldtype.h
   trunk/glom/mode_design/fields/dialog_fieldcalculation.h
   trunk/glom/mode_design/fields/dialog_fielddefinition.h
   trunk/glom/mode_design/print_layouts/box_print_layouts.h
   trunk/glom/mode_design/print_layouts/canvas_layout_item.h
   trunk/glom/mode_design/print_layouts/canvas_print_layout.h
   trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
   trunk/glom/mode_design/print_layouts/print_layout_toolbar_button.h
   trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
   trunk/glom/mode_design/script_library/dialog_script_library.h
   trunk/glom/mode_design/users/dialog_choose_user.h
   trunk/glom/mode_design/users/dialog_groups_list.h
   trunk/glom/mode_design/users/dialog_user.h
   trunk/glom/mode_design/users/dialog_users_list.h
   trunk/glom/mode_find/box_data_details_find.h
   trunk/glom/mode_find/box_data_list_find.h
   trunk/glom/mode_find/notebook_find.h
   trunk/glom/navigation/box_tables.h
   trunk/glom/printoperation_printlayout.h
   trunk/glom/relationships_overview/canvas_group_dbtable.h
   trunk/glom/relationships_overview/dialog_relationships_overview.h
   trunk/glom/relationships_overview/printoperation_relationshipsoverview.h
   trunk/glom/reports/dialog_layout_report.h
   trunk/glom/reports/report_builder.h
   trunk/glom/reports/treestore_report_layout.h
   trunk/glom/translation/combobox_locale.h
   trunk/glom/translation/dialog_change_language.h
   trunk/glom/translation/dialog_copy_translation.h
   trunk/glom/translation/dialog_identify_original.h
   trunk/glom/translation/window_translations.h
   trunk/glom/utility_widgets/adddel/adddel_withbuttons.h
   trunk/glom/utility_widgets/adddel/treeviewcolumn_glom.h
   trunk/glom/utility_widgets/buttonglom.h
   trunk/glom/utility_widgets/canvas/canvas_editable.h
   trunk/glom/utility_widgets/canvas/canvas_group_grid.h
   trunk/glom/utility_widgets/canvas/canvas_group_movable.h
   trunk/glom/utility_widgets/canvas/canvas_group_resizable.h
   trunk/glom/utility_widgets/canvas/canvas_image_movable.h
   trunk/glom/utility_widgets/canvas/canvas_item_movable.h
   trunk/glom/utility_widgets/canvas/canvas_line_movable.h
   trunk/glom/utility_widgets/canvas/canvas_rect_movable.h
   trunk/glom/utility_widgets/canvas/canvas_table_movable.h
   trunk/glom/utility_widgets/canvas/canvas_text_movable.h
   trunk/glom/utility_widgets/canvas/test_canvas_editable.cc
   trunk/glom/utility_widgets/cellrendererlist/cellrendererlist.h
   trunk/glom/utility_widgets/checkglom.h
   trunk/glom/utility_widgets/combo_textglade.h
   trunk/glom/utility_widgets/comboentry_currency.h
   trunk/glom/utility_widgets/comboentryglom.h
   trunk/glom/utility_widgets/comboglom.h
   trunk/glom/utility_widgets/datawidget.h
   trunk/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h
   trunk/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h
   trunk/glom/utility_widgets/db_adddel/db_adddel.h
   trunk/glom/utility_widgets/db_adddel/db_adddel_withbuttons.h
   trunk/glom/utility_widgets/db_adddel/db_treeviewcolumn_glom.h
   trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h
   trunk/glom/utility_widgets/dialog_choose_date.h
   trunk/glom/utility_widgets/dialog_choose_id.h
   trunk/glom/utility_widgets/dialog_flowtable.h
   trunk/glom/utility_widgets/dialog_layoutitem_properties.h
   trunk/glom/utility_widgets/entryglom.h
   trunk/glom/utility_widgets/filechooserdialog_saveextras.h
   trunk/glom/utility_widgets/flowtable_dnd.h
   trunk/glom/utility_widgets/imageglom.h
   trunk/glom/utility_widgets/labelglom.h
   trunk/glom/utility_widgets/layouttoolbarbutton.h
   trunk/glom/utility_widgets/layoutwidgetbase.h
   trunk/glom/utility_widgets/layoutwidgetfield.h
   trunk/glom/utility_widgets/layoutwidgetutils.h
   trunk/glom/utility_widgets/notebooklabelglom.h
   trunk/glom/utility_widgets/placeholder-glom.h
   trunk/glom/utility_widgets/placeholder.h
   trunk/glom/utility_widgets/sidebar.h
   trunk/glom/utility_widgets/table_columns.h
   trunk/glom/utility_widgets/textviewglom.h

Modified: trunk/glom/application.h
==============================================================================
--- trunk/glom/application.h	(original)
+++ trunk/glom/application.h	Mon Mar  2 18:47:54 2009
@@ -83,7 +83,7 @@
 
   static App_Glom* get_application();
 
-protected:
+private:
   virtual void init_layout(); //override.
   virtual void init_menus_file(); //override.
   virtual void init_menus(); //override.

Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc	(original)
+++ trunk/glom/base_db.cc	Mon Mar  2 18:47:54 2009
@@ -87,7 +87,7 @@
       return false;
   }
 
-protected:
+private:
   sharedptr<const T_Element> m_layout_item;
 };
 

Modified: trunk/glom/box_reports.h
==============================================================================
--- trunk/glom/box_reports.h	(original)
+++ trunk/glom/box_reports.h	Mon Mar  2 18:47:54 2009
@@ -33,7 +33,7 @@
   Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~Box_Reports();
 
-protected:
+private:
   virtual bool fill_from_database(); //override
 
   virtual void fill_row(const Gtk::TreeModel::iterator& iter, const sharedptr<const Report>& report);

Modified: trunk/glom/box_withbuttons.h
==============================================================================
--- trunk/glom/box_withbuttons.h	(original)
+++ trunk/glom/box_withbuttons.h	Mon Mar  2 18:47:54 2009
@@ -67,7 +67,7 @@
   virtual Gtk::Widget* get_default_button();
 
 
-protected:
+private:
 
   //virtual void hint_set(const Glib::ustring& strText);
 

Modified: trunk/glom/combobox_fields.h
==============================================================================
--- trunk/glom/combobox_fields.h	(original)
+++ trunk/glom/combobox_fields.h	Mon Mar  2 18:47:54 2009
@@ -67,7 +67,7 @@
   Glib::ustring get_selected_field_name() const;
 
 
-protected:
+private:
 
   //void on_cell_data_name(const Gtk::TreeModel::const_iterator& iter);
   void on_cell_data_title(const Gtk::TreeModel::const_iterator& iter);

Modified: trunk/glom/combobox_relationship.h
==============================================================================
--- trunk/glom/combobox_relationship.h	(original)
+++ trunk/glom/combobox_relationship.h	Mon Mar  2 18:47:54 2009
@@ -57,7 +57,7 @@
   ///Select the parent table.
   void set_selected_parent_table(const Glib::ustring& table_name, const Glib::ustring& table_title = Glib::ustring());
 
-protected:
+private:
 
   //void on_cell_data_name(const Gtk::TreeModel::const_iterator& iter);
   void on_cell_data_title(const Gtk::TreeModel::const_iterator& iter);

Modified: trunk/glom/dialog_connection.h
==============================================================================
--- trunk/glom/dialog_connection.h	(original)
+++ trunk/glom/dialog_connection.h	Mon Mar  2 18:47:54 2009
@@ -61,7 +61,7 @@
    */
   void set_database_name(const Glib::ustring& name);
 
-protected:
+private:
   Gtk::Entry* m_entry_host;
   Gtk::Entry* m_entry_user;
   Gtk::Entry* m_entry_password;

Modified: trunk/glom/dialog_database_preferences.h
==============================================================================
--- trunk/glom/dialog_database_preferences.h	(original)
+++ trunk/glom/dialog_database_preferences.h	Mon Mar  2 18:47:54 2009
@@ -47,7 +47,7 @@
   virtual void load_from_document(); //override
   virtual void save_to_document(); //override
 
-protected:
+private:
   void on_response(int response_id);
 
   void on_button_choose_image();

Modified: trunk/glom/dialog_existing_or_new.cc
==============================================================================
--- trunk/glom/dialog_existing_or_new.cc	(original)
+++ trunk/glom/dialog_existing_or_new.cc	Mon Mar  2 18:47:54 2009
@@ -68,7 +68,8 @@
     return m_title;
   }
 
-protected:
+//TODO: Put this in a .cc file.
+private:
   virtual void on_start_element(const Glib::ustring& name, const AttributeList& attributes)
   {
     if(m_title.empty()) // Already found name? Wait for parse_chunk() call to return.

Modified: trunk/glom/dialog_existing_or_new.h
==============================================================================
--- trunk/glom/dialog_existing_or_new.h	(original)
+++ trunk/glom/dialog_existing_or_new.h	Mon Mar  2 18:47:54 2009
@@ -63,7 +63,7 @@
   Glib::ustring get_service_name() const; // Only when get_action is OPEN_REMOTE
 #endif
 
-protected:
+private:
   Action get_action_impl(Gtk::TreeModel::iterator& iter) const;
 
   std::auto_ptr<Gtk::TreeModel::iterator> create_dummy_item_existing(const Gtk::TreeModel::iterator& parent, const Glib::ustring& text);

Modified: trunk/glom/dialog_import_csv.h
==============================================================================
--- trunk/glom/dialog_import_csv.h	(original)
+++ trunk/glom/dialog_import_csv.h	Mon Mar  2 18:47:54 2009
@@ -67,7 +67,7 @@
 
   SignalStateChanged signal_state_changed() const { return m_signal_state_changed; }
 
-protected:
+private:
   void clear();
   void show_error_dialog(const Glib::ustring& primary, const Glib::ustring& secondary);
 

Modified: trunk/glom/dialog_import_csv_progress.h
==============================================================================
--- trunk/glom/dialog_import_csv_progress.h	(original)
+++ trunk/glom/dialog_import_csv_progress.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   // parsed data within a separate class.
   void import(Dialog_Import_CSV& data_source);
 
-protected:
+private:
   void clear();
   void add_text(const Glib::ustring& text);
 

Modified: trunk/glom/dialog_invalid_data.h
==============================================================================
--- trunk/glom/dialog_invalid_data.h	(original)
+++ trunk/glom/dialog_invalid_data.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
    */
   virtual void set_example_data(Field::glom_field_type glom_type);
 
-protected:
+private:
   Gtk::Label* m_label;
 };
 

Modified: trunk/glom/dialog_new_self_hosted_connection.h
==============================================================================
--- trunk/glom/dialog_new_self_hosted_connection.h	(original)
+++ trunk/glom/dialog_new_self_hosted_connection.h	Mon Mar  2 18:47:54 2009
@@ -46,7 +46,7 @@
   virtual void load_from_document(); //override
 
 
-protected:
+private:
   Gtk::Entry* m_entry_user;
   Gtk::Entry* m_entry_password;
   Gtk::Entry* m_entry_password_confirm;

Modified: trunk/glom/filechooser_export.h
==============================================================================
--- trunk/glom/filechooser_export.h	(original)
+++ trunk/glom/filechooser_export.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   void get_layout_groups(Document_Glom::type_list_layout_groups& layout_groups) const;
 
-protected:
+private:
 
   void on_button_define_layout();
   void on_dialog_layout_hide();

Modified: trunk/glom/glom_privs.h
==============================================================================
--- trunk/glom/glom_privs.h	(original)
+++ trunk/glom/glom_privs.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
   static bool get_user_is_in_group(const Glib::ustring& user, const Glib::ustring& group);
   static Privileges get_current_privs(const Glib::ustring& table_name);
 
-protected:
+private:
   static bool on_privs_privileges_cache_timeout(const Glib::ustring& table_name);
 
   typedef std::map<Glib::ustring, Privileges> type_map_privileges;

Modified: trunk/glom/layout_item_dialogs/box_formatting.h
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.h	(original)
+++ trunk/glom/layout_item_dialogs/box_formatting.h	Mon Mar  2 18:47:54 2009
@@ -57,7 +57,7 @@
   //we hide some stuff:
   void set_is_for_print_layout();
 
-protected:
+private:
   //Signal handlers:
   void on_combo_choices_relationship_changed();
   void on_checkbox();

Modified: trunk/glom/layout_item_dialogs/combo_summarytype.h
==============================================================================
--- trunk/glom/layout_item_dialogs/combo_summarytype.h	(original)
+++ trunk/glom/layout_item_dialogs/combo_summarytype.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
   virtual void set_summary_type(LayoutItem_FieldSummary::summaryType summary_type);
   virtual LayoutItem_FieldSummary::summaryType get_summary_type() const;
 
-protected:
+private:
 
   //Tree model columns:
   //These columns are used by the model that is created by the default constructor

Modified: trunk/glom/layout_item_dialogs/comboentry_borderwidth.h
==============================================================================
--- trunk/glom/layout_item_dialogs/comboentry_borderwidth.h	(original)
+++ trunk/glom/layout_item_dialogs/comboentry_borderwidth.h	Mon Mar  2 18:47:54 2009
@@ -35,7 +35,7 @@
   ComboEntry_BorderWidth(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~ComboEntry_BorderWidth();
 
-protected:
+private:
 
   /** Get the correct text representation of the @a number for the current locale:
    */

Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.h	Mon Mar  2 18:47:54 2009
@@ -46,7 +46,7 @@
   sharedptr<LayoutItem_Button> get_script() const;
   void get_script (const sharedptr<LayoutItem_Button>& script) const;
 
-protected:
+private:
   void on_button_test();
 
   Gtk::Entry* m_entry_title;

Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.h	Mon Mar  2 18:47:54 2009
@@ -49,7 +49,7 @@
 
   sharedptr<LayoutItem_Field> get_field_chosen() const;
 
-protected:
+private:
   void on_radiobutton_custom_formatting();
   void enforce_constraints();
 

Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.h	Mon Mar  2 18:47:54 2009
@@ -49,7 +49,7 @@
 
   sharedptr<LayoutItem_FieldSummary> get_item() const;
 
-protected:
+private:
   //Signal handlers:
   void on_button_field();
 

Modified: trunk/glom/layout_item_dialogs/dialog_group_by.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
 
   sharedptr<LayoutItem_GroupBy> get_item() const;
 
-protected:
+private:
   //Signal handlers:
   void on_button_field_group_by();
   void on_button_formatting_group_by();

Modified: trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
   void set_fields(const Glib::ustring& table_name, const LayoutGroup::type_list_items& table_fields);
   LayoutGroup::type_list_items get_fields() const;
 
-protected:
+private:
 
   //Enable/disable buttons, depending on treeview selection:
   virtual void enable_buttons();

Modified: trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
   void set_fields(const Glib::ustring& table_name, const LayoutItem_GroupBy::type_list_sort_fields& table_fields);
   LayoutItem_GroupBy::type_list_sort_fields get_fields() const;
 
-protected:
+private:
 
   //Enable/disable buttons, depending on treeview selection:
   virtual void enable_buttons();

Modified: trunk/glom/layout_item_dialogs/dialog_imageobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_imageobject.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_imageobject.h	Mon Mar  2 18:47:54 2009
@@ -42,7 +42,7 @@
   void set_imageobject(const sharedptr<const LayoutItem_Image>& imageobject, const Glib::ustring& table_name, bool show_title = true);
   sharedptr<LayoutItem_Image> get_imageobject() const;
 
-protected:
+private:
   void on_button_choose();
 
   Gtk::HBox* m_box_title;

Modified: trunk/glom/layout_item_dialogs/dialog_notebook.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_notebook.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_notebook.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
   void set_notebook(const sharedptr<const LayoutItem_Notebook>& start_notebook);
   sharedptr<LayoutItem_Notebook> get_notebook() const;
 
-protected:
+private:
 
   //Enable/disable buttons, depending on treeview selection:
   virtual void enable_buttons();

Modified: trunk/glom/layout_item_dialogs/dialog_textobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_textobject.h	(original)
+++ trunk/glom/layout_item_dialogs/dialog_textobject.h	Mon Mar  2 18:47:54 2009
@@ -42,7 +42,7 @@
   sharedptr<LayoutItem_Text> get_textobject() const;
   void get_textobject(sharedptr<LayoutItem_Text>& textobject) const;
 
-protected:
+private:
   Gtk::HBox* m_box_title;
   Gtk::Entry* m_entry_title;
   Gtk::TextView* m_text_view;

Modified: trunk/glom/libglom/appstate.h
==============================================================================
--- trunk/glom/libglom/appstate.h	(original)
+++ trunk/glom/libglom/appstate.h	Mon Mar  2 18:47:54 2009
@@ -59,7 +59,7 @@
   /// The user interface should handle this signal and alter itself accordingly.
   type_signal_userlevel_changed signal_userlevel_changed();
 
-protected:
+private:
 
   userlevels m_userlevel;
   type_signal_userlevel_changed m_signal_userlevel_changed;

Modified: trunk/glom/libglom/connectionpool.h
==============================================================================
--- trunk/glom/libglom/connectionpool.h	(original)
+++ trunk/glom/libglom/connectionpool.h	Mon Mar  2 18:47:54 2009
@@ -71,7 +71,7 @@
   typedef sigc::signal<void> type_signal_finished;
   type_signal_finished signal_finished();
 
-protected:
+private:
   Glib::RefPtr<Gnome::Gda::Connection> m_gda_connection;
 
   type_signal_finished m_signal_finished;
@@ -84,7 +84,7 @@
  */
 class ConnectionPool : public sigc::trackable
 {
-protected:
+private:
   ConnectionPool();
   //ConnectionPool(const ConnectionPool& src);
   virtual ~ConnectionPool();
@@ -217,7 +217,7 @@
    */
   static bool check_user_is_not_root();
 
-protected:
+private:
   void on_sharedconnection_finished();
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -236,7 +236,7 @@
 #endif // !G_OS_WIN32
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-protected:
+private:
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   EpcPublisher* m_epc_publisher;

Modified: trunk/glom/libglom/connectionpool_backends/backend.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/backend.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/backend.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
 
   virtual failure_type get_failure_type() const;
 
-protected:
+private:
   failure_type m_failure_type;
 };
 

Modified: trunk/glom/libglom/connectionpool_backends/postgres.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres.h	Mon Mar  2 18:47:54 2009
@@ -56,7 +56,7 @@
    */
   static bool check_postgres_gda_client_is_available_with_warning();
 
-protected:
+private:
   virtual Field::sql_format get_sql_format() const { return Field::SQL_FORMAT_POSTGRES; }
   virtual bool supports_remote_access() const { return true; }
   virtual Glib::ustring get_string_find_operator() const { return "ILIKE"; } // ILIKE is a postgres extension for locale-dependent case-insensitive matches.
@@ -64,9 +64,11 @@
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   virtual bool change_columns(const Glib::RefPtr<Gnome::Gda::Connection>& connection, const Glib::ustring& table_name, const type_vecConstFields& old_fields, const type_vecConstFields& new_fields, std::auto_ptr<Glib::Error>& error);
 
+protected:
   bool attempt_create_database(const Glib::ustring& database_name, const Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<Glib::Error>& error);
 #endif
 
+protected:
   Glib::RefPtr<Gnome::Gda::Connection> attempt_connect(const Glib::ustring& host, const Glib::ustring& port, const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<ExceptionConnection>& error);
 
 private:

Modified: trunk/glom/libglom/connectionpool_backends/postgres_central.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_central.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_central.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
   int get_port() const;
   bool get_try_other_ports() const;
 
-protected:
+private:
   virtual Glib::RefPtr<Gnome::Gda::Connection> connect(const Glib::ustring& database, const Glib::ustring& username, const Glib::ustring& password, std::auto_ptr<ExceptionConnection>& error);
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY

Modified: trunk/glom/libglom/connectionpool_backends/postgres_self.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/postgres_self.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/postgres_self.h	Mon Mar  2 18:47:54 2009
@@ -66,7 +66,7 @@
    */
   static bool install_postgres(Gtk::Window* parent_window);
 
-protected:
+private:
   virtual bool initialize(Gtk::Window* parent_window, const Glib::ustring& initial_username, const Glib::ustring& password);
 
   virtual bool startup(Gtk::Window* parent_window);

Modified: trunk/glom/libglom/connectionpool_backends/sqlite.h
==============================================================================
--- trunk/glom/libglom/connectionpool_backends/sqlite.h	(original)
+++ trunk/glom/libglom/connectionpool_backends/sqlite.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
   void set_database_directory_uri(const std::string& directory_uri);
   const std::string& get_database_directory_uri() const;
 
-protected:
+private:
   virtual Field::sql_format get_sql_format() const { return Field::SQL_FORMAT_SQLITE; }
   virtual bool supports_remote_access() const { return false; }
   virtual Glib::ustring get_string_find_operator() const { return "LIKE"; }

Modified: trunk/glom/libglom/data_structure/field.h
==============================================================================
--- trunk/glom/libglom/data_structure/field.h	(original)
+++ trunk/glom/libglom/data_structure/field.h	Mon Mar  2 18:47:54 2009
@@ -62,7 +62,7 @@
     return (element->get_name() == m_strName);
   }
 
-protected:
+private:
   Glib::ustring m_strName;
 };
 
@@ -235,7 +235,7 @@
 
   FieldFormatting m_default_formatting;
 
-protected:
+private:
 
   static void init_map();
 

Modified: trunk/glom/libglom/data_structure/fieldtypes.h
==============================================================================
--- trunk/glom/libglom/data_structure/fieldtypes.h	(original)
+++ trunk/glom/libglom/data_structure/fieldtypes.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   GType get_fallback_type_for_gdavaluetype(GType field_type) const;
   
-protected:
+private:
   typedef std::map<Glib::ustring, GType> type_mapSchemaStringsToGdaTypes;
   type_mapSchemaStringsToGdaTypes m_mapSchemaStringsToGdaTypes;
 

Modified: trunk/glom/libglom/data_structure/layout/custom_title.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/custom_title.h	(original)
+++ trunk/glom/libglom/data_structure/layout/custom_title.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   bool get_use_custom_title() const;
   void set_use_custom_title(bool use_custom_title = true);
 
-protected:
+private:
 
   //We need this in order to specify that an empty custom title should really be used.
   bool m_use_custom_title;

Modified: trunk/glom/libglom/data_structure/layout/fieldformatting.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/fieldformatting.h	(original)
+++ trunk/glom/libglom/data_structure/layout/fieldformatting.h	Mon Mar  2 18:47:54 2009
@@ -86,7 +86,7 @@
 
   NumericFormat m_numeric_format; //Only used for numeric fields.
 
-protected:
+private:
 
   type_list_values m_choices_custom_list; //A drop-down list of possible values for the field.
   bool m_choices_restricted;

Modified: trunk/glom/libglom/data_structure/layout/layoutgroup.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutgroup.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutgroup.h	Mon Mar  2 18:47:54 2009
@@ -107,7 +107,7 @@
 
   type_list_items m_list_items;
 
-protected:
+private:
 
   double m_border_width; //For use on reports.
 };

Modified: trunk/glom/libglom/data_structure/layout/layoutitem.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
   bool operator==(const LayoutItem& src) const;
 
   virtual bool get_editable() const;
-  virtual void set_editable(bool val);
+  virtual void set_editable(bool val = true);
 
   virtual Glib::ustring get_layout_display_name() const;
   virtual Glib::ustring get_part_type_name() const = 0;
@@ -71,7 +71,7 @@
 
   //bool m_hidden;
 
-protected:
+private:
   Glib::ustring m_name;
   bool m_editable;
 

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_button.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_button.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_button.h	Mon Mar  2 18:47:54 2009
@@ -52,7 +52,7 @@
    */
   void set_script(const Glib::ustring& script);
 
-protected:
+private:
   Glib::ustring m_script;
 };
 

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.cc	Mon Mar  2 18:47:54 2009
@@ -67,7 +67,9 @@
 {
   LayoutItem_Portal::change_field_item_name(table_name, field_name, field_name_new);
   
-  if(m_relationship && (m_relationship->get_to_table() == table_name) && (m_date_field->get_name() == field_name))
+  sharedptr<const Relationship> relationship = get_relationship();
+        
+  if(relationship && (relationship->get_to_table() == table_name) && (m_date_field->get_name() == field_name))
       m_date_field->set_name(field_name_new); //Change it.
 }
 

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_calendarportal.h	Mon Mar  2 18:47:54 2009
@@ -48,7 +48,7 @@
   virtual void change_related_field_item_name(const Glib::ustring& table_name, const Glib::ustring& field_name, const Glib::ustring& field_name_new);
 
 
-protected:
+private:
   sharedptr<Field> m_date_field;
 };
 

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_field.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_field.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_field.cc	Mon Mar  2 18:47:54 2009
@@ -159,7 +159,7 @@
     return false; //Calculations can never be edited.
   }
 
-  return m_editable && m_priv_edit;
+  return get_editable() && m_priv_edit;
 }
 
 Glib::ustring LayoutItem_Field::get_layout_display_name() const
@@ -169,7 +169,7 @@
   if(m_field_cache_valid && m_field)
     result = m_field->get_name();
   else
-    result = m_name;
+    result = get_name();
 
   //Indicate if it's a field in another table.
   if(get_has_related_relationship_name())

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_field.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_field.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_field.h	Mon Mar  2 18:47:54 2009
@@ -56,7 +56,7 @@
     return (*uses_a == *uses_b);
   }
     
-protected:
+private:
   sharedptr<const T_Element> m_layout_item;
 };
 
@@ -133,7 +133,7 @@
    */
   Glib::ustring get_sql_name(const Glib::ustring& parent_table) const;
 
-protected:
+private:
 
   //This is just a cache, filled in by looking at the database structure:
   sharedptr<const Field> m_field;

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_image.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_image.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_image.h	Mon Mar  2 18:47:54 2009
@@ -63,7 +63,7 @@
   //Saves the image to a temporary file and provides the file URI.
   Glib::ustring create_local_image_uri() const;
 
-protected:
+private:
 
   Gnome::Gda::Value m_image;
 };

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_line.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_line.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_line.h	Mon Mar  2 18:47:54 2009
@@ -52,7 +52,7 @@
    */
   void set_coordinates(double start_x, double start_y, double end_x, double end_y);
 
-protected:
+private:
 
   double m_start_x, m_start_y, m_end_x, m_end_y;
 };

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_notebook.h	Mon Mar  2 18:47:54 2009
@@ -43,9 +43,6 @@
   virtual LayoutItem* clone() const;
 
   virtual Glib::ustring get_part_type_name() const;
-
-protected:
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_placeholder.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_placeholder.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_placeholder.h	Mon Mar  2 18:47:54 2009
@@ -47,10 +47,6 @@
   virtual Glib::ustring get_report_part_id() const;
   
   bool operator==(const LayoutItem_Placeholder* src) const;
-protected:
-
-private:
-
 };
 
 }

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_portal.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_portal.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_portal.cc	Mon Mar  2 18:47:54 2009
@@ -88,7 +88,8 @@
       }
       else
       {
-        if(m_relationship && (m_relationship->get_to_table() == table_name) && (field_item->get_name() == field_name))
+        sharedptr<const Relationship> relationship = get_relationship();
+        if(relationship && (relationship->get_to_table() == table_name) && (field_item->get_name() == field_name))
           field_item->set_name(field_name_new); //Change it.
       }
     }

Modified: trunk/glom/libglom/data_structure/layout/layoutitem_portal.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/layoutitem_portal.h	(original)
+++ trunk/glom/libglom/data_structure/layout/layoutitem_portal.h	Mon Mar  2 18:47:54 2009
@@ -61,7 +61,7 @@
   /// This is used only for the print layouts.
   void set_print_layout_row_height(double row_height);
 
-protected:
+private:
 
   //If no navigation relationship has been specified then it will be automatically chosen: 
   bool m_navigation_relationship_specific_main;

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc	Mon Mar  2 18:47:54 2009
@@ -61,7 +61,7 @@
 
 Glib::ustring LayoutItem_FieldSummary::get_title_or_name() const
 {
-  Glib::ustring field_title = m_field->get_title_or_name();
+  const Glib::ustring field_title = get_full_field_details()->get_title_or_name();
 
   return get_summary_type_name(m_summary_type) + ": " + field_title; //TODO: Allow a more human-readable title for summary headings.
 }

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h	Mon Mar  2 18:47:54 2009
@@ -69,7 +69,7 @@
 
   static Glib::ustring get_summary_type_name(summaryType summary_type);
 
-protected:
+private:
   summaryType m_summary_type;
 };
 

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_footer.h	Mon Mar  2 18:47:54 2009
@@ -43,9 +43,6 @@
 
   virtual Glib::ustring get_part_type_name() const;
   virtual Glib::ustring get_report_part_id() const;
-
-protected:
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.h	Mon Mar  2 18:47:54 2009
@@ -71,9 +71,8 @@
 
   type_list_sort_fields m_fields_sort_by;
 
-protected:
+private:
   sharedptr<LayoutItem_Field> m_field_group_by;
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_header.h	Mon Mar  2 18:47:54 2009
@@ -43,9 +43,6 @@
 
   virtual Glib::ustring get_part_type_name() const;
   virtual Glib::ustring get_report_part_id() const;
-
-protected:
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h	(original)
+++ trunk/glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h	Mon Mar  2 18:47:54 2009
@@ -43,9 +43,6 @@
 
   virtual Glib::ustring get_part_type_name() const;
   virtual Glib::ustring get_report_part_id() const;
-
-protected:
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/layout/usesrelationship.h
==============================================================================
--- trunk/glom/libglom/data_structure/layout/usesrelationship.h	(original)
+++ trunk/glom/libglom/data_structure/layout/usesrelationship.h	Mon Mar  2 18:47:54 2009
@@ -79,12 +79,11 @@
 
   Glib::ustring get_sql_table_or_join_alias_name(const Glib::ustring& parent_table) const;
 
-protected:
+private:
 
   //This is just cached data, so we don't need to always lookup the relationship details from the document, from the name.
   sharedptr<Relationship> m_relationship;
   sharedptr<Relationship> m_related_relationship; //Rarely used. It is for showing fields from the (related) relationships of related tables.
-
 };
 
 } //namespace Glom

Modified: trunk/glom/libglom/data_structure/print_layout.h
==============================================================================
--- trunk/glom/libglom/data_structure/print_layout.h	(original)
+++ trunk/glom/libglom/data_structure/print_layout.h	Mon Mar  2 18:47:54 2009
@@ -45,7 +45,7 @@
   Glib::RefPtr<Gtk::PageSetup> get_page_setup();
   Glib::RefPtr<const Gtk::PageSetup> get_page_setup() const;
 
-protected:
+private:
   bool m_show_table_title;
 
   Glib::RefPtr<Gtk::PageSetup> m_page_setup;

Modified: trunk/glom/libglom/data_structure/relationship.h
==============================================================================
--- trunk/glom/libglom/data_structure/relationship.h	(original)
+++ trunk/glom/libglom/data_structure/relationship.h	Mon Mar  2 18:47:54 2009
@@ -67,7 +67,7 @@
    */
   bool get_has_to_table() const;
 
-protected:
+private:
   Glib::ustring m_strFrom_Table;
   Glib::ustring m_strFrom_Field;
   Glib::ustring m_strTo_Table;

Modified: trunk/glom/libglom/data_structure/report.h
==============================================================================
--- trunk/glom/libglom/data_structure/report.h	(original)
+++ trunk/glom/libglom/data_structure/report.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   sharedptr<LayoutGroup> m_layout_group;
 
-protected:
+private:
   bool m_show_table_title;
 };
 

Modified: trunk/glom/libglom/data_structure/translatable_item.h
==============================================================================
--- trunk/glom/libglom/data_structure/translatable_item.h	(original)
+++ trunk/glom/libglom/data_structure/translatable_item.h	Mon Mar  2 18:47:54 2009
@@ -129,7 +129,7 @@
 
   static bool get_current_locale_not_original();
 
-protected:
+private:
 
   /** Get the locale used as the source language.
    * This is the language of the title that is used when there are no translations.
@@ -137,8 +137,10 @@
   static Glib::ustring get_original_locale();
 
 
-
+protected:
   enumTranslatableItemType m_translatable_item_type;
+
+private:
   Glib::ustring m_name; //Non-translated identifier;
   Glib::ustring m_title; //The original, untranslated (usually-English) title.
   type_map_locale_to_translations m_map_translations;

Modified: trunk/glom/libglom/dialog_progress_creating.h
==============================================================================
--- trunk/glom/libglom/dialog_progress_creating.h	(original)
+++ trunk/glom/libglom/dialog_progress_creating.h	Mon Mar  2 18:47:54 2009
@@ -49,7 +49,7 @@
 
   virtual bool on_delete_event(GdkEventAny* event);
 
-protected:
+private:
   Gtk::ProgressBar* m_progress;
   Gtk::Label* m_label_message;
 

Modified: trunk/glom/libglom/document/document_glom.h
==============================================================================
--- trunk/glom/libglom/document/document_glom.h	(original)
+++ trunk/glom/libglom/document/document_glom.h	Mon Mar  2 18:47:54 2009
@@ -66,7 +66,7 @@
            (element.m_layout_platform == m_layout_platform);
   }
 
-protected:
+private:
   Glib::ustring m_parent_table, m_layout_name, m_layout_platform;
 };
 
@@ -425,7 +425,7 @@
   // in client only mode
   static void set_node_attribute_value_as_decimal_double(xmlpp::Element* node, const Glib::ustring& strAttributeName, double value);
 
-protected:
+private:
 
   //Overrides:
 

Modified: trunk/glom/libglom/sharedptr.h
==============================================================================
--- trunk/glom/libglom/sharedptr.h	(original)
+++ trunk/glom/libglom/sharedptr.h	Mon Mar  2 18:47:54 2009
@@ -163,7 +163,7 @@
   inline size_type* _get_refcount() const
   { return m_pRefCount; }
 
-protected:
+private:
   inline void ref();
   inline void unref();
 

Modified: trunk/glom/libglom/test_avahi_publisher.cc
==============================================================================
--- trunk/glom/libglom/test_avahi_publisher.cc	(original)
+++ trunk/glom/libglom/test_avahi_publisher.cc	Mon Mar  2 18:47:54 2009
@@ -10,7 +10,7 @@
   TestWindow();
   virtual ~TestWindow();
 
-protected:
+private:
   //Signal handlers:
   virtual void on_button_start();
   virtual void on_button_stop();

Modified: trunk/glom/libglom/utils.cc
==============================================================================
--- trunk/glom/libglom/utils.cc	(original)
+++ trunk/glom/libglom/utils.cc	Mon Mar  2 18:47:54 2009
@@ -133,7 +133,7 @@
     return (element->get_relationship_name() == m_relationship_name) && (element->get_related_relationship_name() == m_related_relationship_name);
   }
 
-protected:
+private:
   Glib::ustring m_relationship_name, m_related_relationship_name;
 };
 

Modified: trunk/glom/mode_data/box_data_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.h	(original)
+++ trunk/glom/mode_data/box_data_calendar_related.h	Mon Mar  2 18:47:54 2009
@@ -48,7 +48,7 @@
    */
   virtual bool init_db_details(const Glib::ustring& parent_table, bool show_title = true);
 
-protected:
+private:
   virtual bool fill_from_database(); //Override.
   virtual type_vecLayoutFields get_fields_to_show() const; //override
     
@@ -90,7 +90,7 @@
   
   void clear_cached_database_values();
     
-protected:
+private:
   GlomGtk::Calendar m_calendar;
     
   //TODO: Avoid repeating these in so many widgets:

Modified: trunk/glom/mode_data/dialog_choose_field.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.h	(original)
+++ trunk/glom/mode_data/dialog_choose_field.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
 
   sharedptr<LayoutItem_Field> get_field_chosen() const;
 
-protected:
+private:
 
   virtual void on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* view_column);
   virtual void on_treeview_selection_changed();

Modified: trunk/glom/mode_data/dialog_choose_relationship.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_relationship.h	(original)
+++ trunk/glom/mode_data/dialog_choose_relationship.h	Mon Mar  2 18:47:54 2009
@@ -46,7 +46,7 @@
 
   sharedptr<Relationship> get_relationship_chosen() const;
 
-protected:
+private:
 
   //Tree model columns:
   class ModelColumns_Relationships : public Gtk::TreeModel::ColumnRecord

Modified: trunk/glom/mode_data/dialog_layout_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_calendar_related.h	(original)
+++ trunk/glom/mode_data/dialog_layout_calendar_related.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
   sharedptr<Relationship> get_relationship() const;
   sharedptr<LayoutItem_CalendarPortal>  get_portal_layout();
 
-protected:
+private:
 
   virtual void save_to_document();
 

Modified: trunk/glom/mode_data/dialog_layout_export.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_export.h	(original)
+++ trunk/glom/mode_data/dialog_layout_export.h	Mon Mar  2 18:47:54 2009
@@ -42,7 +42,7 @@
 
   void get_layout_groups(Document_Glom::type_list_layout_groups& layout_groups) const;
 
-protected:
+private:
 
   //Enable/disable buttons, depending on treeview selection:
   virtual void enable_buttons();

Modified: trunk/glom/mode_data/dialog_layout_list.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list.h	(original)
+++ trunk/glom/mode_data/dialog_layout_list.h	Mon Mar  2 18:47:54 2009
@@ -31,10 +31,6 @@
 public:
   Dialog_Layout_List(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~Dialog_Layout_List();
-
-protected:
-
-
 };
 
 } //namespace Glom

Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h	(original)
+++ trunk/glom/mode_data/flowtablewithfields.h	Mon Mar  2 18:47:54 2009
@@ -136,7 +136,7 @@
   typedef sigc::signal<void, const sharedptr<LayoutItem_Button>&> type_signal_script_button_clicked;
   type_signal_script_button_clicked signal_script_button_clicked();
   
-protected:
+private:
 
   type_list_widgets get_field(const sharedptr<const LayoutItem_Field>& field);
   type_list_const_widgets get_field(const sharedptr<const LayoutItem_Field>& field) const;

Modified: trunk/glom/mode_data/treestore_layout.h
==============================================================================
--- trunk/glom/mode_data/treestore_layout.h	(original)
+++ trunk/glom/mode_data/treestore_layout.h	Mon Mar  2 18:47:54 2009
@@ -30,7 +30,7 @@
 
 class TreeStore_Layout : public Gtk::TreeStore
 {
-protected:
+private:
   TreeStore_Layout();
 
 public:
@@ -54,7 +54,7 @@
   virtual void fill_sequences();
   virtual void fill_sequences(const iterator& iter);
 
-protected:
+private:
   //Overridden virtual functions:
   virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const;
   virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData& selection_data) const;

Modified: trunk/glom/mode_design/box_db_table_relationships.h
==============================================================================
--- trunk/glom/mode_design/box_db_table_relationships.h	(original)
+++ trunk/glom/mode_design/box_db_table_relationships.h	Mon Mar  2 18:47:54 2009
@@ -38,7 +38,7 @@
 
   virtual void save_to_document(); //override.
 
-protected:
+private:
   virtual bool fill_from_database();
 
   //Signal handlers:

Modified: trunk/glom/mode_design/dialog_add_related_table.h
==============================================================================
--- trunk/glom/mode_design/dialog_add_related_table.h	(original)
+++ trunk/glom/mode_design/dialog_add_related_table.h	Mon Mar  2 18:47:54 2009
@@ -46,7 +46,7 @@
   typedef sigc::signal<void> type_signal_request_edit_fields;
   type_signal_request_edit_fields signal_request_edit_fields();
 
-protected:
+private:
 
   void on_entry_table_name();
   void on_combo_field_name();

Modified: trunk/glom/mode_design/dialog_design.h
==============================================================================
--- trunk/glom/mode_design/dialog_design.h	(original)
+++ trunk/glom/mode_design/dialog_design.h	Mon Mar  2 18:47:54 2009
@@ -40,9 +40,10 @@
 
   virtual bool init_db_details(const Glib::ustring& table_name);
 
-protected:
+private:
   virtual void on_button_close();
 
+protected:
   Gtk::Label* m_label_table;
   Gtk::Label* m_label_frame;
 };

Modified: trunk/glom/mode_design/dialog_fields.h
==============================================================================
--- trunk/glom/mode_design/dialog_fields.h	(original)
+++ trunk/glom/mode_design/dialog_fields.h	Mon Mar  2 18:47:54 2009
@@ -35,7 +35,7 @@
 
   virtual bool init_db_details(const Glib::ustring& table_name);
 
-protected:
+private:
 
   Box_DB_Table_Definition* m_box;
 };

Modified: trunk/glom/mode_design/dialog_relationships.h
==============================================================================
--- trunk/glom/mode_design/dialog_relationships.h	(original)
+++ trunk/glom/mode_design/dialog_relationships.h	Mon Mar  2 18:47:54 2009
@@ -37,7 +37,7 @@
 
   virtual void on_hide();
 
-protected:
+private:
 
   Box_DB_Table_Relationships* m_box;
 };

Modified: trunk/glom/mode_design/fields/box_db_table_definition.h
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.h	(original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.h	Mon Mar  2 18:47:54 2009
@@ -34,7 +34,7 @@
   Box_DB_Table_Definition(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~Box_DB_Table_Definition();
 
-protected:
+private:
   void init(); //Avoid duplicating code in constructors.
   virtual bool fill_from_database();
   virtual void fill_fields();

Modified: trunk/glom/mode_design/fields/combo_fieldtype.h
==============================================================================
--- trunk/glom/mode_design/fields/combo_fieldtype.h	(original)
+++ trunk/glom/mode_design/fields/combo_fieldtype.h	Mon Mar  2 18:47:54 2009
@@ -53,7 +53,7 @@
     return item.second == m_valueToFind;
   }
 
-protected:
+private:
   type_value m_valueToFind;
 };
 
@@ -69,7 +69,7 @@
   virtual void set_field_type(Field::glom_field_type fieldType);
   virtual Field::glom_field_type get_field_type() const;
 
-protected:
+private:
 
   void init();
 

Modified: trunk/glom/mode_design/fields/dialog_fieldcalculation.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fieldcalculation.h	(original)
+++ trunk/glom/mode_design/fields/dialog_fieldcalculation.h	Mon Mar  2 18:47:54 2009
@@ -42,7 +42,7 @@
   void set_field(const sharedptr<const Field>& field, const Glib::ustring& table_name);
   sharedptr<Field> get_field() const;
 
-protected:
+private:
   void on_button_test();
   bool check_for_return_statement(const Glib::ustring& calculation);
 

Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.h	(original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.h	Mon Mar  2 18:47:54 2009
@@ -48,7 +48,7 @@
   virtual void set_field(const sharedptr<const Field>& field, const Glib::ustring& table_name);
   virtual sharedptr<Field> get_field() const; //TODO_FieldShared
 
-protected:
+private:
 
   //Signal handlers:
   void on_combo_type_changed();

Modified: trunk/glom/mode_design/print_layouts/box_print_layouts.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/box_print_layouts.h	(original)
+++ trunk/glom/mode_design/print_layouts/box_print_layouts.h	Mon Mar  2 18:47:54 2009
@@ -34,7 +34,7 @@
   Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~Box_Print_Layouts();
 
-protected:
+private:
   virtual bool fill_from_database(); //override
 
   virtual void fill_row(const Gtk::TreeModel::iterator& iter, const sharedptr<const PrintLayout>& print_layout);

Modified: trunk/glom/mode_design/print_layouts/canvas_layout_item.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_layout_item.h	(original)
+++ trunk/glom/mode_design/print_layouts/canvas_layout_item.h	Mon Mar  2 18:47:54 2009
@@ -36,7 +36,7 @@
  */
 class CanvasLayoutItem : public CanvasGroupResizable
 {
-protected:
+private:
   CanvasLayoutItem();
   CanvasLayoutItem(const sharedptr<LayoutItem>& layout_item);
   virtual ~CanvasLayoutItem();
@@ -63,7 +63,7 @@
 
   static int get_rows_count_for_portal(const sharedptr<const LayoutItem_Portal>& portal, double& row_height);
 
-protected:
+private:
   /// Create the appropriate inner canvas item to represent the layout item.
   static Glib::RefPtr<CanvasItemMovable> create_canvas_item_for_layout_item(const sharedptr<LayoutItem>& layout_item);
 

Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.h	(original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.h	Mon Mar  2 18:47:54 2009
@@ -64,7 +64,7 @@
 
   virtual void set_grid_gap(double gap = 20.0);
   
-protected:
+private:
 
   void setup_context_menu();
   void add_layout_group(const sharedptr<LayoutGroup>& group, bool is_top_level = false);

Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.h	(original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.h	Mon Mar  2 18:47:54 2009
@@ -43,7 +43,7 @@
   Gtk::VBox* m_box_formatting_placeholder;
   Box_Formatting* m_box_formatting;
 
-protected:
+private:
   virtual void on_button_close();
 };
 

Modified: trunk/glom/mode_design/print_layouts/print_layout_toolbar_button.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/print_layout_toolbar_button.h	(original)
+++ trunk/glom/mode_design/print_layouts/print_layout_toolbar_button.h	Mon Mar  2 18:47:54 2009
@@ -52,7 +52,7 @@
 
   static enumItems get_item_type_from_selection_data(const Glib::RefPtr<Gdk::DragContext>& drag_context, const Gtk::SelectionData& selection_data);
 
-protected:
+private:
 
   //TODO: What is this for? murrayc.
   // We need an unique identifier for drag & drop! jhs

Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.h	(original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.h	Mon Mar  2 18:47:54 2009
@@ -52,7 +52,7 @@
   Glib::ustring get_original_name() const;
   sharedptr<PrintLayout> get_print_layout();
 
-protected:
+private:
 
   void enable_buttons();
   void init_menu();

Modified: trunk/glom/mode_design/script_library/dialog_script_library.h
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.h	(original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.h	Mon Mar  2 18:47:54 2009
@@ -43,7 +43,7 @@
   virtual void load_from_document();
   virtual void save_to_document();
 
-protected:
+private:
   void on_button_add();
   void on_button_remove();
   void on_button_check();

Modified: trunk/glom/mode_design/users/dialog_choose_user.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_choose_user.h	(original)
+++ trunk/glom/mode_design/users/dialog_choose_user.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   Glib::ustring get_user() const;
 
-protected:
+private:
   Combo_TextGlade* m_combo_name;
 };
 

Modified: trunk/glom/mode_design/users/dialog_groups_list.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.h	(original)
+++ trunk/glom/mode_design/users/dialog_groups_list.h	Mon Mar  2 18:47:54 2009
@@ -47,7 +47,7 @@
    */
   //virtual void set_document(const Glib::ustring& layout, Document_Glom* document, const Glib::ustring& table_name, const type_vecLayoutFields& table_fields);
 
-protected:
+private:
 
   void fill_group_list();
   void fill_table_list(const Glib::ustring& group_name);

Modified: trunk/glom/mode_design/users/dialog_user.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_user.h	(original)
+++ trunk/glom/mode_design/users/dialog_user.h	Mon Mar  2 18:47:54 2009
@@ -48,13 +48,6 @@
   Combo_TextGlade* m_combo_group;
   Gtk::Entry* m_entry_password;
   Gtk::Entry* m_entry_password_confirm;
-
-protected:
-
-  //virtual void save_to_document();
-
-  //signal handlers:
-
 };
 
 } //namespace Glom

Modified: trunk/glom/mode_design/users/dialog_users_list.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.h	(original)
+++ trunk/glom/mode_design/users/dialog_users_list.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
 
   virtual void set_group(const Glib::ustring& group_name);
 
-protected:
+private:
 
   void fill_list();
 

Modified: trunk/glom/mode_find/box_data_details_find.h
==============================================================================
--- trunk/glom/mode_find/box_data_details_find.h	(original)
+++ trunk/glom/mode_find/box_data_details_find.h	Mon Mar  2 18:47:54 2009
@@ -36,7 +36,7 @@
 
   virtual Gtk::Widget* get_default_button(); //override
 
-protected:
+private:
 
   virtual bool fill_from_database(); //override.
   virtual void fill_related(); //override.

Modified: trunk/glom/mode_find/box_data_list_find.h
==============================================================================
--- trunk/glom/mode_find/box_data_list_find.h	(original)
+++ trunk/glom/mode_find/box_data_list_find.h	Mon Mar  2 18:47:54 2009
@@ -36,7 +36,7 @@
 
   virtual Gtk::Widget* get_default_button(); //override
 
-protected:
+private:
 
   virtual bool fill_from_database(); //override.
   virtual void create_layout();

Modified: trunk/glom/mode_find/notebook_find.h
==============================================================================
--- trunk/glom/mode_find/notebook_find.h	(original)
+++ trunk/glom/mode_find/notebook_find.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
    */
   sigc::signal<void, Glib::ustring> signal_find_criteria;
 
-protected:
+private:
 
 
   //Signal handlers:

Modified: trunk/glom/navigation/box_tables.h
==============================================================================
--- trunk/glom/navigation/box_tables.h	(original)
+++ trunk/glom/navigation/box_tables.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~Box_Tables();
 
-protected:
+private:
   virtual bool fill_from_database(); //override
 
   virtual void fill_table_row(const Gtk::TreeModel::iterator& iter, const sharedptr<const TableInfo>& table_info);

Modified: trunk/glom/printoperation_printlayout.h
==============================================================================
--- trunk/glom/printoperation_printlayout.h	(original)
+++ trunk/glom/printoperation_printlayout.h	Mon Mar  2 18:47:54 2009
@@ -28,13 +28,13 @@
 //so we can put the actual print implementation here.
 class PrintOperationPrintLayout : public Gtk::PrintOperation
 {
- public:
+public:
   static Glib::RefPtr<PrintOperationPrintLayout> create();
   virtual ~PrintOperationPrintLayout();
 
   void set_canvas(Canvas_PrintLayout* canvas);
 
- protected:
+private:
   PrintOperationPrintLayout();
 
   //PrintOperation default signal handler overrides:

Modified: trunk/glom/relationships_overview/canvas_group_dbtable.h
==============================================================================
--- trunk/glom/relationships_overview/canvas_group_dbtable.h	(original)
+++ trunk/glom/relationships_overview/canvas_group_dbtable.h	Mon Mar  2 18:47:54 2009
@@ -30,7 +30,7 @@
 
 class CanvasGroupDbTable : public CanvasGroupMovable
 {
-protected:
+private:
   CanvasGroupDbTable(const Glib::ustring& table_name, const Glib::ustring& table_title, const Document_Glom::type_vecFields& fields, double x = 0.0, double y = 0.0);
   virtual ~CanvasGroupDbTable();
 
@@ -44,7 +44,7 @@
   Glib::ustring get_table_name() const;
   double get_field_y(const Glib::ustring& field_name) const;
 
-protected:
+private:
    Glib::RefPtr<Goocanvas::Item> m_rect;
    Glib::RefPtr<Goocanvas::Item> m_text;
    Glib::RefPtr<Goocanvas::Item> m_line;

Modified: trunk/glom/relationships_overview/dialog_relationships_overview.h
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.h	(original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
   
   virtual void load_from_document(); //overridden.
 
-protected:
+private:
   class TableView;
   
   void draw_tables();

Modified: trunk/glom/relationships_overview/printoperation_relationshipsoverview.h
==============================================================================
--- trunk/glom/relationships_overview/printoperation_relationshipsoverview.h	(original)
+++ trunk/glom/relationships_overview/printoperation_relationshipsoverview.h	Mon Mar  2 18:47:54 2009
@@ -28,13 +28,13 @@
 //so we can put the actual print implementation here.
 class PrintOperationRelationshipsOverview : public Gtk::PrintOperation
 {
- public:
+public:
   static Glib::RefPtr<PrintOperationRelationshipsOverview> create();
   virtual ~PrintOperationRelationshipsOverview();
 
   void set_canvas(Goocanvas::Canvas* canvas);
 
- protected:
+private:
   PrintOperationRelationshipsOverview();
 
   //PrintOperation default signal handler overrides:

Modified: trunk/glom/reports/dialog_layout_report.h
==============================================================================
--- trunk/glom/reports/dialog_layout_report.h	(original)
+++ trunk/glom/reports/dialog_layout_report.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
 
   Glib::ustring get_original_report_name() const;
 
-protected:
+private:
 
   typedef TreeStore_ReportLayout type_model;
 

Modified: trunk/glom/reports/report_builder.h
==============================================================================
--- trunk/glom/reports/report_builder.h	(original)
+++ trunk/glom/reports/report_builder.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
 
  
 
-protected:
+private:
 
   void report_build_groupby(const FoundSet& found_set_parent, xmlpp::Element& parent_node, const sharedptr<LayoutItem_GroupBy>& group_by);
   void report_build_groupby_children(const FoundSet& found_set, xmlpp::Element& nodeGroupBy, const sharedptr<LayoutItem_GroupBy>& group_by);

Modified: trunk/glom/reports/treestore_report_layout.h
==============================================================================
--- trunk/glom/reports/treestore_report_layout.h	(original)
+++ trunk/glom/reports/treestore_report_layout.h	Mon Mar  2 18:47:54 2009
@@ -29,7 +29,7 @@
 
 class TreeStore_ReportLayout : public Gtk::TreeStore
 {
-protected:
+private:
   TreeStore_ReportLayout();
 
 public:
@@ -55,7 +55,7 @@
 
   static bool may_be_child_of(const sharedptr<const LayoutItem>& parent, const sharedptr<const LayoutItem>& suggested_child);
 
-protected:
+private:
   //Overridden virtual functions:
   virtual bool row_draggable_vfunc(const Gtk::TreeModel::Path& path) const;
   virtual bool row_drop_possible_vfunc(const Gtk::TreeModel::Path& dest, const Gtk::SelectionData& selection_data) const;

Modified: trunk/glom/translation/combobox_locale.h
==============================================================================
--- trunk/glom/translation/combobox_locale.h	(original)
+++ trunk/glom/translation/combobox_locale.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
   void set_selected_locale(const Glib::ustring& locale);
   Glib::ustring get_selected_locale() const;
 
-protected:
+private:
 
   //Tree model columns:
   //These columns are used by the model that is created by the default constructor

Modified: trunk/glom/translation/dialog_change_language.h
==============================================================================
--- trunk/glom/translation/dialog_change_language.h	(original)
+++ trunk/glom/translation/dialog_change_language.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
 
   Glib::ustring get_locale() const;
 
-protected:
+private:
   ComboBox_Locale* m_combo_locale;
 };
 

Modified: trunk/glom/translation/dialog_copy_translation.h
==============================================================================
--- trunk/glom/translation/dialog_copy_translation.h	(original)
+++ trunk/glom/translation/dialog_copy_translation.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   Glib::ustring get_locale() const;
 
-protected:
+private:
   ComboBox_Locale* m_combo_locale;
 };
 

Modified: trunk/glom/translation/dialog_identify_original.h
==============================================================================
--- trunk/glom/translation/dialog_identify_original.h	(original)
+++ trunk/glom/translation/dialog_identify_original.h	Mon Mar  2 18:47:54 2009
@@ -43,7 +43,7 @@
 
   virtual void load_from_document(); //override
 
-protected:
+private:
   Gtk::Label* m_label_original;
   ComboBox_Locale* m_combo_locale;
 };

Modified: trunk/glom/translation/window_translations.h
==============================================================================
--- trunk/glom/translation/window_translations.h	(original)
+++ trunk/glom/translation/window_translations.h	Mon Mar  2 18:47:54 2009
@@ -46,7 +46,7 @@
   virtual void load_from_document(); //override
   virtual void save_to_document(); //override
 
-protected:
+private:
 
   //Enable/disable buttons, depending on treeview selection:
   virtual void enable_buttons();

Modified: trunk/glom/utility_widgets/adddel/adddel_withbuttons.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel_withbuttons.h	(original)
+++ trunk/glom/utility_widgets/adddel/adddel_withbuttons.h	Mon Mar  2 18:47:54 2009
@@ -37,7 +37,7 @@
   virtual void set_allow_delete(bool val = true); //override
   virtual void set_allow_user_actions(bool bVal = true); //override
 
-protected:
+private:
   void init();
   void setup_buttons();
 

Modified: trunk/glom/utility_widgets/adddel/treeviewcolumn_glom.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/treeviewcolumn_glom.h	(original)
+++ trunk/glom/utility_widgets/adddel/treeviewcolumn_glom.h	Mon Mar  2 18:47:54 2009
@@ -35,7 +35,7 @@
   virtual Glib::ustring get_column_id() const;
   virtual void set_column_id(const Glib::ustring& value);
 
-protected:
+private:
   Glib::ustring m_column_id; 
 };
 

Modified: trunk/glom/utility_widgets/buttonglom.h
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.h	(original)
+++ trunk/glom/utility_widgets/buttonglom.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
   explicit ButtonGlom();
   virtual ~ButtonGlom();
 
-protected:
+private:
   void init();
 
   virtual App_Glom* get_application();

Modified: trunk/glom/utility_widgets/canvas/canvas_editable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_editable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_editable.h	Mon Mar  2 18:47:54 2009
@@ -59,7 +59,7 @@
   typedef sigc::signal<void, guint, guint32> type_signal_show_context;
   type_signal_show_context signal_show_context();
 
-protected:
+private:
   
   static Glib::RefPtr<Goocanvas::Item> get_parent_container_or_self(const Glib::RefPtr<Goocanvas::Item>& item);
 
@@ -76,8 +76,10 @@
     bool m_resizable;
   };
 
+protected:
   Glib::RefPtr<CanvasGroupGrid> m_grid;
 
+public:
   type_signal_show_context m_signal_show_context;
 };
 

Modified: trunk/glom/utility_widgets/canvas/canvas_group_grid.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_group_grid.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_group_grid.h	Mon Mar  2 18:47:54 2009
@@ -32,7 +32,7 @@
 
 class CanvasGroupGrid : public Goocanvas::Group
 {
-protected:
+private:
   CanvasGroupGrid();
   virtual ~CanvasGroupGrid();
 
@@ -70,7 +70,7 @@
   void add_vertical_rule(double x);
   void add_horizontal_rule(double x);
 
-protected:
+private:
   void create_lines();
   Glib::RefPtr<Goocanvas::Polyline> create_grid_or_rule_line(double x1, double y1, double x2, double y2, bool is_rule = false);
 

Modified: trunk/glom/utility_widgets/canvas/canvas_group_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_group_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_group_movable.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
   virtual void set_width_height(double width, double height);
   virtual void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid);
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   enum Corners

Modified: trunk/glom/utility_widgets/canvas/canvas_group_resizable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_group_resizable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_group_resizable.h	Mon Mar  2 18:47:54 2009
@@ -37,8 +37,6 @@
     public CanvasItemMovable
 {
 protected:
-  /** @param add_manipulators Derived classes may want to use false here.
-   */
   CanvasGroupResizable();
   virtual ~CanvasGroupResizable();
 
@@ -67,7 +65,7 @@
   /// This signal is emitted when the canvas item is resized by the user.
   type_signal_resized signal_resized();
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   virtual void snap_position(double& x, double& y) const;

Modified: trunk/glom/utility_widgets/canvas/canvas_image_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_image_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_image_movable.h	Mon Mar  2 18:47:54 2009
@@ -31,7 +31,7 @@
   : public Goocanvas::Image,
     public CanvasItemMovable
 {
-protected:
+private:
   CanvasImageMovable(double x = 0.0, double y = 0.0);
   CanvasImageMovable(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, double x = 0.0, double y = 0.0);
   virtual ~CanvasImageMovable();
@@ -77,7 +77,7 @@
   virtual void get_width_height(double& width, double& height) const;
   virtual void set_width_height(double width, double height);
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   virtual void snap_position(double& x, double& y) const;

Modified: trunk/glom/utility_widgets/canvas/canvas_item_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_item_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_item_movable.h	Mon Mar  2 18:47:54 2009
@@ -90,11 +90,11 @@
   static Glib::RefPtr<Goocanvas::Item> cast_to_item(const Glib::RefPtr<CanvasItemMovable>& item);
   static Glib::RefPtr<const Goocanvas::Item> cast_const_to_item(const Glib::RefPtr<const CanvasItemMovable>& item);
 
-protected:
+  virtual void snap_position(double& x, double& y) const;
 
-  virtual Goocanvas::Canvas* get_parent_canvas_widget() = 0;
+private:
 
-  virtual void snap_position(double& x, double& y) const;
+  virtual Goocanvas::Canvas* get_parent_canvas_widget() = 0;
 
   void set_cursor(const Gdk::Cursor& cursor);
   void unset_cursor();
@@ -107,15 +107,17 @@
   bool on_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event);
   bool on_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event);
 
-protected:
+private:
   bool m_dragging;
   bool m_dragging_vertical_only, m_dragging_horizontal_only; //Set by using Ctrl while dragging.
   double m_drag_start_cursor_x, m_drag_start_cursor_y;
   double m_drag_start_position_x, m_drag_start_position_y;
   Gdk::Cursor m_drag_cursor;
 
+protected:
   Glib::RefPtr<const CanvasGroupGrid> m_grid;
 
+private:
   bool m_allow_vertical_movement, m_allow_horizontal_movement;
 
   type_signal_moved m_signal_moved;

Modified: trunk/glom/utility_widgets/canvas/canvas_line_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_line_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_line_movable.h	Mon Mar  2 18:47:54 2009
@@ -32,7 +32,7 @@
   : public Goocanvas::Polyline,
     public CanvasItemMovable
 {
-protected:
+private:
   CanvasLineMovable();
   virtual ~CanvasLineMovable();
 
@@ -44,7 +44,7 @@
 public:
   static Glib::RefPtr<CanvasLineMovable> create();
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
 };

Modified: trunk/glom/utility_widgets/canvas/canvas_rect_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_rect_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_rect_movable.h	Mon Mar  2 18:47:54 2009
@@ -31,7 +31,7 @@
   : public Goocanvas::Rect,
     public CanvasItemMovable
 {
-protected:
+private:
   CanvasRectMovable();
   CanvasRectMovable(double x, double y, double width, double height);
   virtual ~CanvasRectMovable();
@@ -61,7 +61,7 @@
   virtual void get_width_height(double& width, double& height) const;
   virtual void set_width_height(double width, double height);
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   virtual void snap_position(double& x, double& y) const;

Modified: trunk/glom/utility_widgets/canvas/canvas_table_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_table_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_table_movable.h	Mon Mar  2 18:47:54 2009
@@ -31,7 +31,7 @@
   : public Goocanvas::Table,
     public CanvasItemMovable
 {
-protected:
+private:
   CanvasTableMovable();
   virtual ~CanvasTableMovable();
 
@@ -44,7 +44,7 @@
   virtual void set_width_height(double width, double height);
   virtual void set_grid(const Glib::RefPtr<const CanvasGroupGrid>& grid);
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   enum Corners

Modified: trunk/glom/utility_widgets/canvas/canvas_text_movable.h
==============================================================================
--- trunk/glom/utility_widgets/canvas/canvas_text_movable.h	(original)
+++ trunk/glom/utility_widgets/canvas/canvas_text_movable.h	Mon Mar  2 18:47:54 2009
@@ -31,7 +31,7 @@
   : public Goocanvas::Text,
     public CanvasItemMovable
 {
-protected:
+private:
   CanvasTextMovable(const Glib::ustring& string = Glib::ustring(), double x = 0.0, double y = 0.0, double width = 0.0, Gtk::AnchorType anchor = Gtk::ANCHOR_NORTH_WEST);
   virtual ~CanvasTextMovable();
 
@@ -69,7 +69,7 @@
    */
   void set_font_points(const Glib::ustring& font);
 
-protected:
+private:
   virtual Goocanvas::Canvas* get_parent_canvas_widget();
 
   virtual void snap_position(double& x, double& y) const;

Modified: trunk/glom/utility_widgets/canvas/test_canvas_editable.cc
==============================================================================
--- trunk/glom/utility_widgets/canvas/test_canvas_editable.cc	(original)
+++ trunk/glom/utility_widgets/canvas/test_canvas_editable.cc	Mon Mar  2 18:47:54 2009
@@ -131,7 +131,7 @@
 
   }
 
-protected:
+private:
   //This is an override:
   virtual void on_show_context_menu(guint button, guint32 activate_time)
   {

Modified: trunk/glom/utility_widgets/cellrendererlist/cellrendererlist.h
==============================================================================
--- trunk/glom/utility_widgets/cellrendererlist/cellrendererlist.h	(original)
+++ trunk/glom/utility_widgets/cellrendererlist/cellrendererlist.h	Mon Mar  2 18:47:54 2009
@@ -48,7 +48,7 @@
 
   friend void c_callback_CellRendererList_on_editing_started(GtkCellRenderer* /* self */, GtkCellEditable* cell_editable, const gchar* /* path */, void* data);
 
-protected:
+private:
 
   //Tree model columns for the Combo CellRenderer in the TreeView column:
   class ModelColumns : public Gtk::TreeModel::ColumnRecord

Modified: trunk/glom/utility_widgets/checkglom.h
==============================================================================
--- trunk/glom/utility_widgets/checkglom.h	(original)
+++ trunk/glom/utility_widgets/checkglom.h	Mon Mar  2 18:47:54 2009
@@ -44,7 +44,7 @@
   virtual void set_value(const Gnome::Gda::Value& value);
   virtual Gnome::Gda::Value get_value() const;    
 
-protected:
+private:
   void init();
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY

Modified: trunk/glom/utility_widgets/combo_textglade.h
==============================================================================
--- trunk/glom/utility_widgets/combo_textglade.h	(original)
+++ trunk/glom/utility_widgets/combo_textglade.h	Mon Mar  2 18:47:54 2009
@@ -51,7 +51,7 @@
   ///This ensures that something is selected:
   void set_first_active();
 
-protected:
+private:
 
   //This determines whether each row should be shown as a separator.
   bool on_row_separator(const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::iterator& iter);

Modified: trunk/glom/utility_widgets/comboentry_currency.h
==============================================================================
--- trunk/glom/utility_widgets/comboentry_currency.h	(original)
+++ trunk/glom/utility_widgets/comboentry_currency.h	Mon Mar  2 18:47:54 2009
@@ -37,7 +37,7 @@
   ComboEntry_Currency(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   virtual ~ComboEntry_Currency();
 
-protected:
+private:
 
   //Tree model columns:
   //These columns are used by the model that is created by the default constructor

Modified: trunk/glom/utility_widgets/comboentryglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.h	(original)
+++ trunk/glom/utility_widgets/comboentryglom.h	Mon Mar  2 18:47:54 2009
@@ -62,7 +62,7 @@
 
   virtual void set_read_only(bool read_only = true);
 
-protected:
+private:
   void init();
 
 

Modified: trunk/glom/utility_widgets/comboglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboglom.h	(original)
+++ trunk/glom/utility_widgets/comboglom.h	Mon Mar  2 18:47:54 2009
@@ -63,7 +63,7 @@
 
   virtual Gnome::Gda::Value get_value() const;
 
-protected:
+private:
   void init();
 
   // Note this is a normal signal handlers when compiled without default

Modified: trunk/glom/utility_widgets/datawidget.h
==============================================================================
--- trunk/glom/utility_widgets/datawidget.h	(original)
+++ trunk/glom/utility_widgets/datawidget.h	Mon Mar  2 18:47:54 2009
@@ -77,7 +77,7 @@
   typedef sigc::signal<void, const Gnome::Gda::Value&> type_signal_open_details_requested;
   type_signal_open_details_requested signal_open_details_requested();
 
-protected:
+private:
   //virtual void setup_menu();
 
   //Overrides of default signal handlers:

Modified: trunk/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/cellrenderer_buttonimage.h	Mon Mar  2 18:47:54 2009
@@ -38,7 +38,7 @@
   typedef sigc::signal<void, const Gtk::TreeModel::Path&> type_signal_clicked;
   type_signal_clicked signal_clicked();
   
-protected:
+private:
 #ifndef GLIBMM_VFUNCS_ENABLED
   static gboolean activate_impl(GtkCellRenderer* cell, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
 #endif

Modified: trunk/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/cellrenderer_buttontext.h	Mon Mar  2 18:47:54 2009
@@ -38,7 +38,7 @@
   typedef sigc::signal<void, const Gtk::TreeModel::Path&> type_signal_clicked;
   type_signal_clicked signal_clicked();
   
-protected:
+private:
 #ifndef GLIBMM_VFUNCS_ENABLED
   static gboolean activate_impl(GtkCellRenderer* cell, GdkEvent* event, GtkWidget* widget, const gchar* path, GdkRectangle* background_area, GdkRectangle* cell_area, GtkCellRendererState flags);
 #endif

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.h	Mon Mar  2 18:47:54 2009
@@ -259,7 +259,7 @@
 
   virtual void set_open_button_title(const Glib::ustring& title);
 
-protected:
+private:
   
   
   //Overrides of Base_DB/Base_DB_Table methods:
@@ -286,7 +286,10 @@
   ///Return the query column index of any columns that display this field:
   type_list_indexes get_data_model_column_index(const sharedptr<const LayoutItem_Field>& layout_item_field) const;
 
+protected:
   virtual void setup_menu();
+
+private:
   virtual Gnome::Gda::Value treeview_get_key(const Gtk::TreeModel::iterator& row) const;
 
   ///Add a blank row, or return the existing blank row if there already is one.
@@ -304,10 +307,13 @@
 
   virtual bool on_button_press_event_Popup(GdkEventButton* event);
 
+protected:
   void on_MenuPopup_activate_Edit();
   void on_MenuPopup_activate_Add();
   void on_MenuPopup_activate_Delete();
 
+private:
+
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   void on_MenuPopup_activate_layout();
 #endif
@@ -374,8 +380,10 @@
   bool m_column_sorted_direction; //true means ascending. 
   guint m_column_sorted; //Previously-clicked (on the treeview header) column. Remember it so we can reverse the sort order on a second click.
 
+protected:
   Glib::ustring m_open_button_title; //Allow us to change "Open" to "Select".
 
+private:
   //TODO: Avoid repeating these in so many widgets:
   Gtk::Menu* m_pMenuPopup;
   Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;
@@ -393,8 +401,11 @@
 
   type_vecStrings m_vecColumnIDs; //We give each ViewColumn a special ID, so we know where they are after a reorder.
 
+protected:
   bool m_allow_add;
   bool m_allow_delete;
+
+private:
     
   bool m_find_mode;
   bool m_allow_only_one_related_record;
@@ -431,7 +442,7 @@
     InnerIgnore(DbAddDel* pOuter);
     ~InnerIgnore();
 
-  protected:
+  private:
     DbAddDel* m_pOuter;
     bool m_bPreventUserSignals, m_bIgnoreTreeViewSignals;
   };

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel_withbuttons.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel_withbuttons.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel_withbuttons.h	Mon Mar  2 18:47:54 2009
@@ -39,7 +39,7 @@
   ///Whether each row should have a button, to request edit.
   virtual void set_allow_view_details(bool val = true);
 
-protected:
+private:
   void setup_buttons();
 
   void on_button_add();

Modified: trunk/glom/utility_widgets/db_adddel/db_treeviewcolumn_glom.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_treeviewcolumn_glom.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_treeviewcolumn_glom.h	Mon Mar  2 18:47:54 2009
@@ -35,7 +35,7 @@
   virtual Glib::ustring get_column_id() const;
   virtual void set_column_id(const Glib::ustring& value);
 
-protected:
+private:
   Glib::ustring m_column_id; 
 };
 

Modified: trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h	(original)
+++ trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.h	Mon Mar  2 18:47:54 2009
@@ -72,7 +72,7 @@
 
   friend class DbTreeModelRow;
 
-protected:
+private:
   //Create a TreeModel with @a columns_count number of columns, each of type Glib::ustring.
   DbTreeModel(const Gtk::TreeModelColumnRecord& columns, const FoundSet& found_set, const type_vec_fields& column_fields, int column_index_key, bool get_records = true, bool find_mode = false);
   virtual ~DbTreeModel();
@@ -113,7 +113,7 @@
 
   void get_record_counts(gulong& total, gulong& found) const;
 
-protected:
+private:
 
   bool refresh_from_database(const FoundSet& found_set);
 

Modified: trunk/glom/utility_widgets/dialog_choose_date.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_date.h	(original)
+++ trunk/glom/utility_widgets/dialog_choose_date.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   void set_date_chosen(const Gnome::Gda::Value& value);
   Gnome::Gda::Value get_date_chosen() const;
 
-protected:
+private:
   void on_day_selected_double_click();
 
   Gtk::Calendar* m_calendar;

Modified: trunk/glom/utility_widgets/dialog_choose_id.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.h	(original)
+++ trunk/glom/utility_widgets/dialog_choose_id.h	Mon Mar  2 18:47:54 2009
@@ -50,7 +50,7 @@
     STAGE_SELECT
   };
 
-protected:
+private:
 
   void setup();
   void update_ui_for_stage();

Modified: trunk/glom/utility_widgets/dialog_flowtable.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_flowtable.h	(original)
+++ trunk/glom/utility_widgets/dialog_flowtable.h	Mon Mar  2 18:47:54 2009
@@ -43,7 +43,7 @@
   gint get_columns_count();
   Glib::ustring get_title();
     
-protected:
+private:
   Gtk::Entry* m_entry_title;
   Gtk::SpinButton* m_spin_columns;
    

Modified: trunk/glom/utility_widgets/dialog_layoutitem_properties.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_layoutitem_properties.h	(original)
+++ trunk/glom/utility_widgets/dialog_layoutitem_properties.h	Mon Mar  2 18:47:54 2009
@@ -36,7 +36,7 @@
   Glib::ustring get_label() const; 
   void set_label(const Glib::ustring& label);
   
-protected:
+private:
   Gtk::Entry* m_pEntryLabel;
 };
 

Modified: trunk/glom/utility_widgets/entryglom.h
==============================================================================
--- trunk/glom/utility_widgets/entryglom.h	(original)
+++ trunk/glom/utility_widgets/entryglom.h	Mon Mar  2 18:47:54 2009
@@ -56,7 +56,7 @@
 
   virtual void set_read_only(bool read_only = true);
 
-protected:
+private:
   void init();
 
   //Overrides of default signal handlers:

Modified: trunk/glom/utility_widgets/filechooserdialog_saveextras.h
==============================================================================
--- trunk/glom/utility_widgets/filechooserdialog_saveextras.h	(original)
+++ trunk/glom/utility_widgets/filechooserdialog_saveextras.h	Mon Mar  2 18:47:54 2009
@@ -57,7 +57,7 @@
   Document_Glom::HostingMode get_extra_newdb_hosting_mode() const;
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
-protected:
+private:
   void create_child_widgets();
 
   Gtk::VBox m_extra_widget;

Modified: trunk/glom/utility_widgets/flowtable_dnd.h
==============================================================================
--- trunk/glom/utility_widgets/flowtable_dnd.h	(original)
+++ trunk/glom/utility_widgets/flowtable_dnd.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
   FlowTableDnd();
   ~FlowTableDnd();
   
-protected:
+private:
   virtual bool on_drag_motion(const Glib::RefPtr<Gdk::DragContext>& drag_context, int x, int y, guint time);
   virtual void on_drag_leave(const Glib::RefPtr<Gdk::DragContext>& drag_context, guint time);
   virtual void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& drag_context, int, int, const Gtk::SelectionData& selection_data, guint, guint time);
@@ -58,8 +58,10 @@
   void start_dnd(Gtk::Widget& child);
   void stop_dnd(Gtk::Widget& child);
 
+protected:
   virtual void set_design_mode(bool value = true);
-    
+
+private:
   // Methods for the different layout object,
   // to be implemented in the derived class.
   virtual void on_dnd_add_layout_item_field(LayoutWidgetBase* above) = 0;

Modified: trunk/glom/utility_widgets/imageglom.h
==============================================================================
--- trunk/glom/utility_widgets/imageglom.h	(original)
+++ trunk/glom/utility_widgets/imageglom.h	Mon Mar  2 18:47:54 2009
@@ -55,7 +55,7 @@
 
   static Glib::RefPtr<Gdk::Pixbuf> scale_keeping_ratio(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf, int target_height, int target_width);
 
-protected:
+private:
   void init();
 
   // Note that these are normal signal handlers when glibmm was compiled

Modified: trunk/glom/utility_widgets/labelglom.h
==============================================================================
--- trunk/glom/utility_widgets/labelglom.h	(original)
+++ trunk/glom/utility_widgets/labelglom.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   explicit LabelGlom(const Glib::ustring& label, float xalign, float yalign, bool mnemonic = false);
   virtual ~LabelGlom();
 
-protected:
+private:
   void init();
 
   virtual App_Glom* get_application();

Modified: trunk/glom/utility_widgets/layouttoolbarbutton.h
==============================================================================
--- trunk/glom/utility_widgets/layouttoolbarbutton.h	(original)
+++ trunk/glom/utility_widgets/layouttoolbarbutton.h	Mon Mar  2 18:47:54 2009
@@ -37,7 +37,7 @@
   LayoutToolbarButton(const std::string& icon_name, LayoutWidgetBase::enumType type, const Glib::ustring& title, const Glib::ustring& tooltip);
   virtual ~LayoutToolbarButton();
 
-protected:
+private:
 
   //TODO: What is this for? murrayc.
   // We need an unique identifier for drag & drop! jhs

Modified: trunk/glom/utility_widgets/layoutwidgetbase.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetbase.h	(original)
+++ trunk/glom/utility_widgets/layoutwidgetbase.h	Mon Mar  2 18:47:54 2009
@@ -86,11 +86,17 @@
 protected:
   virtual App_Glom* get_application() const; // = 0;
 
+
   static void apply_formatting(Gtk::Widget& widget, const FieldFormatting& formatting);
 
+protected: //TODO: Add accessor?
   sharedptr<LayoutItem> m_pLayoutItem;
+
+protected: //TODO: Add accessor?
   Glib::ustring m_table_name;
 
+private:
+
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   /// Signals that the layout has changed, so it should be saved to the document again.
   type_signal_layout_changed m_signal_layout_changed;

Modified: trunk/glom/utility_widgets/layoutwidgetfield.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetfield.h	(original)
+++ trunk/glom/utility_widgets/layoutwidgetfield.h	Mon Mar  2 18:47:54 2009
@@ -36,8 +36,8 @@
 
   virtual Gnome::Gda::Value get_value() const = 0;
 
-  /**Whether this widget still has the original entered data, instead of just a representation.
-   * For intance, and image widget might only store a preview.
+  /** Whether this widget still has the original entered data, instead of just a representation.
+   * For instance, an image widget might only store a preview.
    */
   virtual bool get_has_original_data() const;
 

Modified: trunk/glom/utility_widgets/layoutwidgetutils.h
==============================================================================
--- trunk/glom/utility_widgets/layoutwidgetutils.h	(original)
+++ trunk/glom/utility_widgets/layoutwidgetutils.h	Mon Mar  2 18:47:54 2009
@@ -40,10 +40,12 @@
   Gtk::Menu* m_pPopupMenuUtils;
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   virtual void on_menu_properties_activate() = 0;
-  // This one is implemented here
+
+  // This one is implemented here:
   virtual void on_menu_delete_activate();
 #endif // !GLOM_ENABLE_CLIENT_ONLY
-  
+
+//private:  
   Glib::RefPtr<Gtk::Action> m_refUtilProperties;
   Glib::RefPtr<Gtk::Action> m_refUtilDelete;  
   Glib::RefPtr<Gtk::ActionGroup> m_refActionGroup;

Modified: trunk/glom/utility_widgets/notebooklabelglom.h
==============================================================================
--- trunk/glom/utility_widgets/notebooklabelglom.h	(original)
+++ trunk/glom/utility_widgets/notebooklabelglom.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
 
   void set_label (const Glib::ustring& title);  
     
-protected:
+private:
   void init();
 
   virtual App_Glom* get_application();

Modified: trunk/glom/utility_widgets/placeholder-glom.h
==============================================================================
--- trunk/glom/utility_widgets/placeholder-glom.h	(original)
+++ trunk/glom/utility_widgets/placeholder-glom.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,8 @@
   //explicit PlaceholderGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
   explicit PlaceholderGlom();
   virtual ~PlaceholderGlom();
-protected:
+
+private:
   virtual App_Glom* get_application();
   
   virtual void on_size_request(Gtk::Requisition* requisition);

Modified: trunk/glom/utility_widgets/placeholder.h
==============================================================================
--- trunk/glom/utility_widgets/placeholder.h	(original)
+++ trunk/glom/utility_widgets/placeholder.h	Mon Mar  2 18:47:54 2009
@@ -40,7 +40,7 @@
   virtual Gtk::Widget* get_child();
   virtual const Gtk::Widget* get_child() const;  
 
-protected:
+private:
   Gtk::Widget* m_pChild;
 };
 

Modified: trunk/glom/utility_widgets/sidebar.h
==============================================================================
--- trunk/glom/utility_widgets/sidebar.h	(original)
+++ trunk/glom/utility_widgets/sidebar.h	Mon Mar  2 18:47:54 2009
@@ -42,7 +42,7 @@
   
   void set_drag_source();
 
-protected:
+private:
   virtual void on_child_detached(Gtk::Widget* child);
   virtual void on_child_attached(Gtk::Widget* child);
     

Modified: trunk/glom/utility_widgets/table_columns.h
==============================================================================
--- trunk/glom/utility_widgets/table_columns.h	(original)
+++ trunk/glom/utility_widgets/table_columns.h	Mon Mar  2 18:47:54 2009
@@ -41,7 +41,7 @@
   
   void add_row(Gtk::Widget& widgetA); //Span 2 columns.
     
-protected:
+private:
   typedef std::vector<Gtk::Justification> type_vecJustification;
   type_vecJustification m_vecJustification;
 

Modified: trunk/glom/utility_widgets/textviewglom.h
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.h	(original)
+++ trunk/glom/utility_widgets/textviewglom.h	Mon Mar  2 18:47:54 2009
@@ -54,7 +54,7 @@
 
   virtual Gnome::Gda::Value get_value() const;
 
-protected:
+private:
   void init();
 
   //Overrides of default signal handlers:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]