← Back to branch summary

~ubuntu-branches/ubuntu/precise/glom/precise-updates

« back to all changes in this revision

Viewing changes to glom/utility_widgets/comboentryglom.h

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-10-09 16:50:36 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20091009165036-orinvwmohk838xxl
Tags: 1.12.2-0ubuntu1
https://launchpad.net/bugs/391664
https://launchpad.net/bugs/428445
https://launchpad.net/bugs/230007
https://launchpad.net/bugs/393229
https://launchpad.net/bugs/393231
https://launchpad.net/bugs/394507
https://launchpad.net/bugs/394887
https://launchpad.net/bugs/394894
https://launchpad.net/bugs/397409
https://launchpad.net/bugs/381563
* New upstream version:
  - FFE LP: #391664
* debian/control:
  - Bump python-gnome2-extras-dev build-dep to >= 2.25.3.
  - Bump libgdamm3.0-dev build-dep to libgdamm4.0-dev >= 3.99.14.
  - Change libgda3-dev build-dep to libgda-4.0-dev.
  - Change libgda3-postgres dependency to libgda-4.0-postgres.
  - Bump libgtkmm-2.4-dev build-dep to >= 2.14.
  - Add build-dep on libgconfmm-2.6-dev.
  - Bump libgoocanvasmm-dev build-dep to >= 0.14.0.
  - Remove build-dep on libbakery-2.6-dev.
  - Bump postgresql-8.3 dependency to postgresql-8.4.
  - Change scrollkeeper build-dep to rarian-compat.
  - Rename libglom{0,-dev} -> libglom-1.12-{0,dev}. Upstream include
    APIVER in the library name now.
* debian/rules:
  - Update --with-postgres-utils configure flag to point to the new
    path.
  - Drop deprecated --disable-scrollkeeper configure flag.
  - Update DEB_SHLIBDEPS_INCLUDE with new libglom-1.12-0 package name.
  - Don't include /usr/share/cdbs/1/rules/simple-patchsys.mk - there
    are currently no patches.
* debian/libglom-1.12-0.install:
  - Updated for new version.
* debian/libglom-1.12-dev.install:
  - Install pc and header files.
* debian/glom-doc.install:
  - Updated for new version.
* debian/glom.install:
  - Updated for new version.
* Fix debian/watch.
* Dropped obsolete 10-distro-install-postgres-change.patch.
* Built against latest libgoocanvasmm (LP: #428445).
* Also closes LP: #230007, LP: #393229, LP: #393231, LP: #394507,
  LP: #394887, LP: #394894, LP: #397409, LP: #381563.

Show diffs side-by-side

added added

removed removed

Lines of Context:
glom/utility_widgets/comboentryglom.h
24
24
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
25
25
 
26
26
#include <gtkmm.h>
27
 
#include <glom/libglom/data_structure/field.h>
 
27
#include <libglom/data_structure/field.h>
28
28
#include "comboglomchoicesbase.h"
29
 
#include <libglademm.h>
 
29
#include <gtkmm/builder.h>
30
30
 
31
31
namespace Glom
32
32
{
38
38
  public ComboGlomChoicesBase
39
39
{
40
40
public:
41
 
  explicit ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
 
41
  explicit ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
42
42
 
43
43
  ///You must call set_layout_item() to specify the field type and formatting of the main column.
44
44
  explicit ComboEntryGlom();
62
62
 
63
63
  virtual void set_read_only(bool read_only = true);
64
64
 
65
 
protected:
 
65
private:
66
66
  void init();
67
67
 
68
68