[glom] Remove the unnused PlaceholderGlom class.



commit e7ae67c8ce379030ccb350e6ed64c3053d927961
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Oct 24 16:34:48 2011 +0200

    Remove the unnused PlaceholderGlom class.
    
    	* glom/mode_data/placeholder-glom.[h|cc]: Remove these files.
    	* Makefile_glom.am: Remove mentions of these files.
    	* glom/mode_data/flowtable_withfields.cc: Remove uses of PlaceholderGlom.

 ChangeLog                             |    8 ++
 Makefile_glom.am                      |    2 -
 glom/mode_data/flowtablewithfields.cc |   28 -------
 glom/mode_data/flowtablewithfields.h  |    1 -
 glom/mode_data/placeholder-glom.cc    |  134 ---------------------------------
 glom/mode_data/placeholder-glom.h     |   59 --------------
 glom/utility_widgets/placeholder.h    |    3 +-
 7 files changed, 10 insertions(+), 225 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4e73b2e..75e54af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-10-24  Murray Cumming  <murrayc murrayc com>
 
+	Remove the unnused PlaceholderGlom class.
+
+	* glom/mode_data/placeholder-glom.[h|cc]: Remove these files.
+	* Makefile_glom.am: Remove mentions of these files.
+	* glom/mode_data/flowtable_withfields.cc: Remove uses of PlaceholderGlom.
+
+2011-10-24  Murray Cumming  <murrayc murrayc com>
+
 	Do not include gtkmm.h, glibmm.h, giomm.h, or similar in headers.
 
 	* Many files: Use more specific includes.
diff --git a/Makefile_glom.am b/Makefile_glom.am
index b69011a..c6c203a 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -152,8 +152,6 @@ glom_source_files = \
 	glom/mode_data/flowtablewithfields.h				\
 	glom/mode_data/notebook_data.cc					\
 	glom/mode_data/notebook_data.h					\
-	glom/mode_data/placeholder-glom.cc			\
-	glom/mode_data/placeholder-glom.h				\
 	glom/mode_data/datawidget/datawidget.cc				\
 	glom/mode_data/datawidget/datawidget.h				\
 	glom/mode_data/datawidget/cellcreation.cc				\
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 7531388..81143dd 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -27,7 +27,6 @@
 #include <glom/utility_widgets/imageglom.h>
 #include <glom/mode_data/datawidget/label.h>
 #include <glom/utility_widgets/dialog_flowtable.h>
-#include <glom/mode_data/placeholder-glom.h>
 #include <glom/application.h>
 #include <gtkmm/checkbutton.h>
 #include <libglom/data_structure/glomconversions.h>
@@ -145,13 +144,6 @@ void FlowTableWithFields::add_layout_item(const sharedptr<LayoutItem>& item)
               sharedptr<LayoutItem_Image> layout_imageobject = sharedptr<LayoutItem_Image>::cast_dynamic(item);
               if(layout_imageobject)
                 add_imageobject(layout_imageobject, m_table_name);
-              else
-              {
-                sharedptr<LayoutItem_Placeholder> layout_placeholder =
-                  sharedptr<LayoutItem_Placeholder>::cast_dynamic(item);
-                if(layout_placeholder)
-                  add_placeholder(layout_placeholder, m_table_name);
-              }
             }
           }
         }
@@ -647,26 +639,6 @@ void FlowTableWithFields::add_textobject(const sharedptr<LayoutItem_Text>& layou
   }
 }
 
-void FlowTableWithFields::add_placeholder(const sharedptr<LayoutItem_Placeholder>& /* layoutitem_placeholder */, const Glib::ustring& /* table_name */)
-{
-  //Delete any existing placeholder (there can be only one):
-  delete m_placeholder;
-  m_placeholder = 0;
-
-  //Add the widget:
-  m_placeholder = Gtk::manage(new Gtk::Alignment());
-  m_placeholder->set(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-  m_placeholder->show();
-
-  PlaceholderGlom* preview = Gtk::manage(new PlaceholderGlom);
-  preview->show();
-
-  m_placeholder->add(*preview);
-
-  m_list_layoutwidgets.push_back(preview);
-  add(*m_placeholder, false);
-}
-
 void FlowTableWithFields::add_imageobject(const sharedptr<LayoutItem_Image>& layoutitem_image, const Glib::ustring& table_name)
 {
   //Add the widget:
diff --git a/glom/mode_data/flowtablewithfields.h b/glom/mode_data/flowtablewithfields.h
index 7a1241c..c4c06e5 100644
--- a/glom/mode_data/flowtablewithfields.h
+++ b/glom/mode_data/flowtablewithfields.h
@@ -247,7 +247,6 @@ private:
   void add_button(const sharedptr<LayoutItem_Button>& layoutitem_button, const Glib::ustring& table_name);
   void add_textobject(const sharedptr<LayoutItem_Text>& layoutitem_text, const Glib::ustring& table_name);
   void add_imageobject(const sharedptr<LayoutItem_Image>& layoutitem_image, const Glib::ustring& table_name);
-  void add_placeholder(const sharedptr<LayoutItem_Placeholder>& layoutitem_image, const Glib::ustring& table_name);
 
   void add_layoutwidgetbase(LayoutWidgetBase* layout_widget);
   void add_layout_notebook(const sharedptr<LayoutItem_Notebook>& notebook);
diff --git a/glom/utility_widgets/placeholder.h b/glom/utility_widgets/placeholder.h
index 294bcd9..4515256 100644
--- a/glom/utility_widgets/placeholder.h
+++ b/glom/utility_widgets/placeholder.h
@@ -27,7 +27,8 @@
 namespace Glom
 {
 
-//TODO: Remove this, using the vbox directly?
+/** This is just an easy way to use a Gtk::Box as a single-item container.
+ */
 class PlaceHolder : public Gtk::Box
 {
 public:



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