GNOME.org
 

[gtkmm] Split tools/extra_defs_gen files into gdk and gtk parts.

commit 768425585e7bc27bc8284e1c045ebf2f3aa35f6a
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Fri Mar 1 16:31:54 2013 +0100

    Split tools/extra_defs_gen files into gdk and gtk parts.
    
    * .gitignore: Add some new generated files.
    * tools/Makefile.am: Add extra_defs_gen/generate_defs_gdk.
    Rename extra_defs_gen/generate_extra_defs to generate_defs_gtk.
    * tools/extra_defs_gen/generate_defs_gtk.cc: Don't get defs for gdk classes.
    * tools/gen_scripts/gtk_generate_extra_defs.sh: Rename extra_defs_gen/
    generate_extra_defs to generate_defs_gtk.
    * tools/extra_defs_gen/generate_defs_gdk.cc: New file. Get defs for
    gdk classes.
    * tools/gen_scripts/gdk_generate_extra_defs.sh: New file. Execute
    generate_defs_gdk.

 .gitignore                                   |    9 ++++-
 ChangeLog                                    |   17 ++++++++-
 tools/Makefile.am                            |   13 ++++--
 tools/extra_defs_gen/generate_defs_gdk.cc    |   53 ++++++++++++++++++++++++++
 tools/extra_defs_gen/generate_defs_gtk.cc    |   23 ++---------
 tools/gen_scripts/gdk_generate_extra_defs.sh |   11 +++++
 tools/gen_scripts/gtk_generate_extra_defs.sh |    9 ++--
 7 files changed, 106 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 716fc19..1dfecb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,6 +290,8 @@ gtk/gtkmm/label.cc
 gtk/gtkmm/label.h
 gtk/gtkmm/layout.cc
 gtk/gtkmm/layout.h
+gtk/gtkmm/levelbar.cc
+gtk/gtkmm/levelbar.h
 gtk/gtkmm/linkbutton.cc
 gtk/gtkmm/linkbutton.h
 gtk/gtkmm/liststore.cc
@@ -300,6 +302,8 @@ gtk/gtkmm/menu.cc
 gtk/gtkmm/menu.h
 gtk/gtkmm/menubar.cc
 gtk/gtkmm/menubar.h
+gtk/gtkmm/menubutton.cc
+gtk/gtkmm/menubutton.h
 gtk/gtkmm/menuitem.cc
 gtk/gtkmm/menuitem.h
 gtk/gtkmm/menushell.cc
@@ -382,6 +386,8 @@ gtk/gtkmm/scrollbar.cc
 gtk/gtkmm/scrollbar.h
 gtk/gtkmm/scrolledwindow.cc
 gtk/gtkmm/scrolledwindow.h
+gtk/gtkmm/searchentry.cc
+gtk/gtkmm/searchentry.h
 gtk/gtkmm/selectiondata.cc
 gtk/gtkmm/selectiondata.h
 gtk/gtkmm/separator.cc
@@ -500,7 +506,8 @@ gtk/stamp-h3
 /tests/*/test
 
 # tools
-tools/extra_defs_gen/generate_extra_defs
+tools/extra_defs_gen/generate_defs_gdk
+tools/extra_defs_gen/generate_defs_gtk
 
 # win32_installer
 win32_installer/gtkmm-installer.nsi
diff --git a/ChangeLog b/ChangeLog
index edc4dd0..3af2234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2013-03-01  Kjell Ahlstedt  <kjell ahlstedt bredband net>
+
+       Split tools/extra_defs_gen files into gdk and gtk parts.
+
+       * .gitignore: Add some new generated files.
+       * tools/Makefile.am: Add extra_defs_gen/generate_defs_gdk.
+       Rename extra_defs_gen/generate_extra_defs to generate_defs_gtk.
+       * tools/extra_defs_gen/generate_defs_gtk.cc: Don't get defs for gdk classes. 
+       * tools/gen_scripts/gtk_generate_extra_defs.sh: Rename extra_defs_gen/
+       generate_extra_defs to generate_defs_gtk.
+       * tools/extra_defs_gen/generate_defs_gdk.cc: New file. Get defs for
+       gdk classes.
+       * tools/gen_scripts/gdk_generate_extra_defs.sh: New file. Execute
+       generate_defs_gdk.
+
 2013-02-28  Kjell Ahlstedt  <kjell ahlstedt bredband net>
 
        Update gdk_docs.xml and gtk_docs.xml.
@@ -41,7 +56,7 @@
 
        Gtk::ScrolledWindow: Do not use a deprecated function.
 
-       * gtk/src/iconinfo.[hg|ccg]: We no longer need to call
+       * gtk/src/scrolledwindow.[hg|ccg]: We no longer need to call
        gtk_scrolled_window_add_with_viewport() because
        its gtk_container_add() vfunc implementation now does the
        same thing for us.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6a626de..07d99b4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,11 +23,16 @@ include $(srcdir)/m4/filelist.am
 gmmproc_m4_includedir = $(libdir)/$(GTKMM_MODULE_NAME)/proc/m4
 dist_gmmproc_m4_include_DATA = $(addprefix m4/,$(files_codegen_m4))
 
-noinst_PROGRAMS = extra_defs_gen/generate_extra_defs
+noinst_PROGRAMS = extra_defs_gen/generate_defs_gdk \
+                  extra_defs_gen/generate_defs_gtk
 
-extra_defs_gen_generate_extra_defs_SOURCES = extra_defs_gen/generate_defs_gtk.cc
-extra_defs_gen_generate_extra_defs_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.4
-extra_defs_gen_generate_extra_defs_LDFLAGS = -no-undefined -avoid-version
+extra_defs_gen_generate_defs_gdk_SOURCES = extra_defs_gen/generate_defs_gdk.cc
+extra_defs_gen_generate_defs_gdk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.4
+extra_defs_gen_generate_defs_gdk_LDFLAGS = -no-undefined -avoid-version
+
+extra_defs_gen_generate_defs_gtk_SOURCES = extra_defs_gen/generate_defs_gtk.cc
+extra_defs_gen_generate_defs_gtk_LDADD   = $(GTKMM_LIBS) -lglibmm_generate_extra_defs-2.4
+extra_defs_gen_generate_defs_gtk_LDFLAGS = -no-undefined -avoid-version
 
 AM_CPPFLAGS = -I$(top_builddir) $(GTHREAD_CFLAGS) $(GTKMM_CFLAGS)
 AM_CXXFLAGS = $(GTKMM_WXXFLAGS)
diff --git a/tools/extra_defs_gen/generate_defs_gdk.cc b/tools/extra_defs_gen/generate_defs_gdk.cc
new file mode 100644
index 0000000..f625270
--- /dev/null
+++ b/tools/extra_defs_gen/generate_defs_gdk.cc
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2001 The Free Software Foundation
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+// We always need to generate the .defs for all types because the code
+// using deprecated API is generated unconditionally and only disabled
+// at compile time.
+#undef GDK_PIXBUF_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+
+#include <glibmm_generate_extra_defs/generate_extra_defs.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+int main(int argc, char** argv)
+{
+  gtk_init(&argc, &argv);
+
+  std::cout << get_defs( GDK_TYPE_APP_LAUNCH_CONTEXT )
+            << get_defs( GDK_TYPE_DRAG_CONTEXT )
+            << get_defs( GDK_TYPE_DISPLAY )
+#if !defined(G_OS_WIN32)
+            << get_defs( GDK_TYPE_DISPLAY_MANAGER )
+#endif /* G_OS_WIN32 */
+            << get_defs( GDK_TYPE_PIXBUF )
+            << get_defs( GDK_TYPE_PIXBUF_ANIMATION )
+            << get_defs( GDK_TYPE_PIXBUF_LOADER )
+            << get_defs( GDK_TYPE_RGBA )
+            << get_defs( GDK_TYPE_SCREEN )
+            << get_defs( GDK_TYPE_VISUAL )
+            << get_defs( GDK_TYPE_WINDOW )
+            ;
+  return 0;
+}
diff --git a/tools/extra_defs_gen/generate_defs_gtk.cc b/tools/extra_defs_gen/generate_defs_gtk.cc
index be4e9c5..d078eb5 100644
--- a/tools/extra_defs_gen/generate_defs_gtk.cc
+++ b/tools/extra_defs_gen/generate_defs_gtk.cc
@@ -22,10 +22,12 @@
 // We always need to generate the .defs for all types because the code
 // using deprecated API is generated unconditionally and only disabled
 // at compile time.
+#undef GDK_PIXBUF_DISABLE_DEPRECATED
 #undef GDK_DISABLE_DEPRECATED
 #undef GTK_DISABLE_DEPRECATED
 
 #include <glibmm_generate_extra_defs/generate_extra_defs.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
@@ -41,21 +43,7 @@ int main(int argc, char** argv)
 {
   gtk_init(&argc, &argv);
 
-  std::cout << get_defs( GDK_TYPE_APP_LAUNCH_CONTEXT )
-            << get_defs( GDK_TYPE_DRAG_CONTEXT )
-            << get_defs( GDK_TYPE_DISPLAY )
-#if !defined(G_OS_WIN32)
-            << get_defs( GDK_TYPE_DISPLAY_MANAGER )
-#endif /* G_OS_WIN32 */
-            << get_defs( GDK_TYPE_PIXBUF )
-            << get_defs( GDK_TYPE_PIXBUF_ANIMATION )
-            << get_defs( GDK_TYPE_PIXBUF_LOADER )
-            << get_defs( GDK_TYPE_RGBA )
-            << get_defs( GDK_TYPE_SCREEN )
-            << get_defs( GDK_TYPE_VISUAL )
-            << get_defs( GDK_TYPE_WINDOW )
-
-            << get_defs( GTK_TYPE_ABOUT_DIALOG )
+  std::cout << get_defs( GTK_TYPE_ABOUT_DIALOG )
             << get_defs( GTK_TYPE_ACCEL_GROUP )
             << get_defs( GTK_TYPE_ACCEL_LABEL )
             << get_defs( GTK_TYPE_ACTION )
@@ -228,8 +216,7 @@ int main(int argc, char** argv)
             << get_defs( GTK_TYPE_VIEWPORT )
             << get_defs( GTK_TYPE_VOLUME_BUTTON )
             << get_defs( GTK_TYPE_WIDGET )
-            << get_defs( GTK_TYPE_WINDOW );
-
-
+            << get_defs( GTK_TYPE_WINDOW )
+            ;
   return 0;
 }
diff --git a/tools/gen_scripts/gdk_generate_extra_defs.sh b/tools/gen_scripts/gdk_generate_extra_defs.sh
new file mode 100755
index 0000000..1820165
--- /dev/null
+++ b/tools/gen_scripts/gdk_generate_extra_defs.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# The script assumes that it resides in the tools/gen_scripts directory
+# and the defs files will be placed in gdk/src.
+
+ROOT_DIR="$(dirname "$0")/../.."
+GEN_DIR="$ROOT_DIR/tools/extra_defs_gen"
+OUT_DIR="$ROOT_DIR/gdk/src"
+
+"$GEN_DIR"/generate_defs_gdk > "$OUT_DIR"/gdk_signals.defs
+
diff --git a/tools/gen_scripts/gtk_generate_extra_defs.sh b/tools/gen_scripts/gtk_generate_extra_defs.sh
index 394ba00..e6e74a3 100755
--- a/tools/gen_scripts/gtk_generate_extra_defs.sh
+++ b/tools/gen_scripts/gtk_generate_extra_defs.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-# Note that JHBUILD_SOURCES should be defined to contain the path to the root
-# of the jhbuild sources.  The script assumes that it resides in the
-# tools/gen_scripts directory and the defs files will be placed in gtk/src.
+# The script assumes that it resides in the tools/gen_scripts directory
+# and the defs files will be placed in gtk/src.
 
 ROOT_DIR="$(dirname "$0")/../.."
 GEN_DIR="$ROOT_DIR/tools/extra_defs_gen"
 OUT_DIR="$ROOT_DIR/gtk/src"
 
-"$GEN_DIR"/../extra_defs_gen/generate_extra_defs > "$OUT_DIR"/gtk_signals.defs
-patch $OUT_DIR/gtk_signals.defs $OUT_DIR/gtk_signals.defs.patch
+"$GEN_DIR"/generate_defs_gtk > "$OUT_DIR"/gtk_signals.defs
+patch "$OUT_DIR"/gtk_signals.defs "$OUT_DIR"/gtk_signals.defs.patch
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]