Commit 639b81c552e063b1ed6a1a5b3a84b050c6c003d0
1 parent
ff2418bf
Exists in
master
and in
1 other branch
Working on gtk-doc support.
Showing
5 changed files
with
33 additions
and
8 deletions
Show diff stats
@@ -0,0 +1,26 @@ | @@ -0,0 +1,26 @@ | ||
1 | +#!/bin/bash -x | ||
2 | +# https://wiki.gnome.org/DocumentationProject/GtkDoc | ||
3 | + | ||
4 | +MYDIR=${PWD} | ||
5 | + | ||
6 | +make Debug | ||
7 | + | ||
8 | +rm -fr gtkdoc | ||
9 | +mkdir gtkdoc | ||
10 | +cd gtkdoc | ||
11 | + | ||
12 | +gtkdoc-scan \ | ||
13 | + --module=tn3270 \ | ||
14 | + --source-dir ${MYDIR}/src/include | ||
15 | + | ||
16 | +LD_LIBRARY_PATH=${MYDIR}/.bin/Debug \ | ||
17 | + gtkdoc-scangobj \ | ||
18 | + --cflags "$(pkg-config --cflags gtk+-3.0 gmodule-2.0 glib-2.0)" \ | ||
19 | + --ldflags "$(pkg-config --libs gtk+-3.0 gmodule-2.0 glib-2.0) -L../.bin/Debug -lv3270 -l3270" \ | ||
20 | + --module tn3270 | ||
21 | + | ||
22 | +gtkdoc-mkdb \ | ||
23 | + --module tn3270 \ | ||
24 | + --output-format xml \ | ||
25 | + --source-dir ${MYDIR}/src | ||
26 | + |
src/include/v3270.h
@@ -64,10 +64,6 @@ | @@ -64,10 +64,6 @@ | ||
64 | typedef struct _v3270 v3270; | 64 | typedef struct _v3270 v3270; |
65 | typedef struct _v3270Class v3270Class; | 65 | typedef struct _v3270Class v3270Class; |
66 | 66 | ||
67 | - /** | ||
68 | - * @brief Informações para desenho de fontes com o cairo. | ||
69 | - * | ||
70 | - */ | ||
71 | typedef struct _v3270FontInfo { | 67 | typedef struct _v3270FontInfo { |
72 | 68 | ||
73 | guint width; | 69 | guint width; |
@@ -233,7 +229,7 @@ | @@ -233,7 +229,7 @@ | ||
233 | GtkIMContext * v3270_get_im_context(GtkWidget *widget); | 229 | GtkIMContext * v3270_get_im_context(GtkWidget *widget); |
234 | gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix); | 230 | gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix); |
235 | void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text); | 231 | void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type, const gchar *title, const gchar *message, const gchar *text); |
236 | - const gchar * v3270_get_session_name(GtkWidget *widget); | 232 | + const gchar * v3270_get_session_name(GtkWidget *widget); |
237 | void v3270_set_session_name(GtkWidget *widget, const gchar *name); | 233 | void v3270_set_session_name(GtkWidget *widget, const gchar *name); |
238 | int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on); | 234 | int v3270_set_script(GtkWidget *widget, const gchar id, gboolean on); |
239 | void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on); | 235 | void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on); |
src/v3270/accessible.c
@@ -554,6 +554,10 @@ static AtkAttributeSet * v3270_accessible_get_default_attributes (AtkText *text) | @@ -554,6 +554,10 @@ static AtkAttributeSet * v3270_accessible_get_default_attributes (AtkText *text) | ||
554 | } | 554 | } |
555 | 555 | ||
556 | /** | 556 | /** |
557 | + * v3270_accessible_get_run_attributes: | ||
558 | + * | ||
559 | + * @widget: V3270 widget. | ||
560 | + * | ||
557 | * Creates an AtkAttributeSet which consists of the attributes explicitly | 561 | * Creates an AtkAttributeSet which consists of the attributes explicitly |
558 | * set at the position offset in the text. start_offset and end_offset are set | 562 | * set at the position offset in the text. start_offset and end_offset are set |
559 | * to the start and end of the range around offset where the attributes are invariant. | 563 | * to the start and end of the range around offset where the attributes are invariant. |
src/v3270/properties.c
@@ -181,7 +181,7 @@ | @@ -181,7 +181,7 @@ | ||
181 | "url", | 181 | "url", |
182 | "url", | 182 | "url", |
183 | "Host URL", | 183 | "Host URL", |
184 | - getenv("LIB3270_DEFAULT_HOST"), | 184 | + NULL, |
185 | G_PARAM_READABLE|G_PARAM_WRITABLE); | 185 | G_PARAM_READABLE|G_PARAM_WRITABLE); |
186 | g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_URL]); | 186 | g_object_class_install_property(gobject_class,PROP_AUTO_DISCONNECT,v3270_properties[PROP_URL]); |
187 | 187 |
src/v3270/widget.c
@@ -1611,8 +1611,7 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) | @@ -1611,8 +1611,7 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix) | ||
1611 | **/ | 1611 | **/ |
1612 | const gchar * v3270_set_url(GtkWidget *widget, const gchar *uri) | 1612 | const gchar * v3270_set_url(GtkWidget *widget, const gchar *uri) |
1613 | { | 1613 | { |
1614 | - g_return_val_if_fail(GTK_IS_V3270(widget),""); | ||
1615 | - g_return_val_if_fail(uri != NULL,""); | 1614 | + g_return_val_if_fail(GTK_IS_V3270(widget),NULL); |
1616 | return lib3270_set_url(GTK_V3270(widget)->host,uri); | 1615 | return lib3270_set_url(GTK_V3270(widget)->host,uri); |
1617 | } | 1616 | } |
1618 | 1617 |