gtkmm r963 - in branches/gtkmm-2-12: . docs/reference docs/reference/images docs/reference/images/widgets gtk/src

[jjongsma svn gnome org]

Author: jjongsma
Date: Tue Feb 19 02:25:29 2008
New Revision: 963
URL: http://svn.gnome.org/viewvc/gtkmm?rev=963&view=rev

Log:
	* docs/reference/Makefile.am:
	* gtk/gtkmm/stock.h:
	* gtk/src/calendar.hg:
	* gtk/src/entry.hg:
	* gtk/src/progressbar.hg:
	* gtk/src/spinbutton.hg:
	* gtk/src/textview.hg: add a few more widget images to the API documentation


Added:
   branches/gtkmm-2-12/docs/reference/images/widgets/calendar1.png   (contents, props changed)
   branches/gtkmm-2-12/docs/reference/images/widgets/entry1.png   (contents, props changed)
   branches/gtkmm-2-12/docs/reference/images/widgets/progressbar1.png   (contents, props changed)
   branches/gtkmm-2-12/docs/reference/images/widgets/spinbutton1.png   (contents, props changed)
   branches/gtkmm-2-12/docs/reference/images/widgets/textview1.png   (contents, props changed)
Modified:
   branches/gtkmm-2-12/ChangeLog
   branches/gtkmm-2-12/docs/reference/Makefile.am
   branches/gtkmm-2-12/docs/reference/images/   (props changed)
   branches/gtkmm-2-12/docs/reference/images/widgets/combobox1.png
   branches/gtkmm-2-12/docs/reference/images/widgets/filechooserbutton1.png
   branches/gtkmm-2-12/gtk/src/calendar.hg
   branches/gtkmm-2-12/gtk/src/entry.hg
   branches/gtkmm-2-12/gtk/src/progressbar.hg
   branches/gtkmm-2-12/gtk/src/spinbutton.hg
   branches/gtkmm-2-12/gtk/src/textview.hg

Modified: branches/gtkmm-2-12/docs/reference/Makefile.am
==============================================================================
--- branches/gtkmm-2-12/docs/reference/Makefile.am	(original)
+++ branches/gtkmm-2-12/docs/reference/Makefile.am	Tue Feb 19 02:25:29 2008
@@ -15,16 +15,17 @@
              $(hierarchy_files) \
              xml/index.xml #Just to satisfy the dependency when building from the tarball.
 
+STOCK_DIR=images/stock
+
 # The html is generated by doxygen. We generate xml also, but we are not distributing it yet.
 # The installdox thing is part of doxygen - it fixes the URLs to point to the glibmm reference docs.
 # beautify_docs moves the * and & next to the C++ types rather than the parameter names.
-html/index.html: $(doxygen_configfile_source)
+html/index.html: $(doxygen_configfile_source) $(STOCK_DIR)
 	-rm -rf html
 	image_path=""; \
-	dir="`pkg-config --silence-errors --variable=prefix gtk+-2.0`/share/gtk-doc/html/gtk"; \
-	test -d "$$dir" && image_path="$$dir"; \
-	dir="$(top_srcdir)/../gtk+/gtk/stock-icons"; \
-	test -d "$$dir" && image_path="$$image_path $$dir"; \
+	for subdir in $(STOCK_DIR)/* ; do \
+		test -d "$$subdir" && image_path="$$image_path $$subdir"; \
+	done; \
 	DOXYGEN_IMAGE_PATH="$${DOXYGEN_IMAGE_PATH:=$$image_path}" doxygen $(doxygen_configfile) \
 	2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt
 	cd html && ./installdox -l glibmm_doxygen_tags   /../../../glibmm-2.4/docs/reference/html \

Added: branches/gtkmm-2-12/docs/reference/images/widgets/calendar1.png
==============================================================================
Binary file. No diff available.

Modified: branches/gtkmm-2-12/docs/reference/images/widgets/combobox1.png
==============================================================================
Binary files. No diff available.

Added: branches/gtkmm-2-12/docs/reference/images/widgets/entry1.png
==============================================================================
Binary file. No diff available.

Modified: branches/gtkmm-2-12/docs/reference/images/widgets/filechooserbutton1.png
==============================================================================
Binary files. No diff available.

Added: branches/gtkmm-2-12/docs/reference/images/widgets/progressbar1.png
==============================================================================
Binary file. No diff available.

Added: branches/gtkmm-2-12/docs/reference/images/widgets/spinbutton1.png
==============================================================================
Binary file. No diff available.

Added: branches/gtkmm-2-12/docs/reference/images/widgets/textview1.png
==============================================================================
Binary file. No diff available.

Modified: branches/gtkmm-2-12/gtk/src/calendar.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/calendar.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/calendar.hg	Tue Feb 19 02:25:29 2008
@@ -47,6 +47,9 @@
  * If performing many 'mark' operations, the calendar can be frozen to
  * prevent flicker, using freeze(), and 'thawed' again using thaw().
  *
+ * The Calendar widget looks like this:
+ * @image html calendar1.png
+ *
  * @ingroup Widgets
  */
 class Calendar : public Widget

Modified: branches/gtkmm-2-12/gtk/src/entry.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/entry.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/entry.hg	Tue Feb 19 02:25:29 2008
@@ -42,6 +42,9 @@
  * longer than the allocation of the widget, the widget will scroll so that
  * the cursor position is visible. 
  *
+ * The Entry widget looks like this:
+ * @image html entry1.png
+ *
  * @ingroup Widgets
  */
 class Entry

Modified: branches/gtkmm-2-12/gtk/src/progressbar.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/progressbar.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/progressbar.hg	Tue Feb 19 02:25:29 2008
@@ -59,6 +59,9 @@
  * the bar, optional text can be displayed along with the bar, and the step
  * size used in activity mode can be set. 
  *
+ * The ProgressBar widget looks like this:
+ * @image html progressbar1.png
+ *
  * @ingroup Widgets
  */
 class ProgressBar : public Widget

Modified: branches/gtkmm-2-12/gtk/src/spinbutton.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/spinbutton.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/spinbutton.hg	Tue Feb 19 02:25:29 2008
@@ -39,6 +39,9 @@
 /** numeric Entry with up/down buttons
  * Slightly misnamed, this should be called a SpinEntry.
  *
+ * The SpinButton widget looks like this:
+ * @image html spinbutton1.png
+ *
  * @ingroup Widgets
  */
 class SpinButton : public Entry

Modified: branches/gtkmm-2-12/gtk/src/textview.hg
==============================================================================
--- branches/gtkmm-2-12/gtk/src/textview.hg	(original)
+++ branches/gtkmm-2-12/gtk/src/textview.hg	Tue Feb 19 02:25:29 2008
@@ -44,6 +44,9 @@
 
 /** Multi-line text editing widget. It displays a Gtk::TextBuffer.
  *
+ * The TextView widget looks like this:
+ * @image html textview1.png
+ *
  * @ingroup Widgets
  * @ingroup Containers
  * @ingroup TextView