Skip to content

GitLab

gtk
gtk
Commit 9a9070c2 authored by Russell Nelson's avatar Russell Nelson Committed by Russ Nelson
Browse files
Options

new_pixmap wasn't using its filename argument. Add descriptions 

Wed Mar 11 22:52:57 1998  Russell Nelson <nelson@crynwr.com>

	* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
	* docs/gtk.texi: Add descriptions
parent aebd3d2d
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 5 deletions
ChangeLog
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-0
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-10
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-2
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-4
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-6
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
ChangeLog.pre-2-8
View file @ 9a9070c2
Wed Mar 11 22:52:57 1998 Russell Nelson <nelson@crynwr.com>
* gtk/gtktest.c: new_pixmap wasn't using its filename argument.
* docs/gtk.texi: Add descriptions
Wed Mar 11 14:36:48 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* gtk/docs/: added tutorial, changed some files around to
......@@ -47,6 +52,7 @@ Thu Mar 12 06:58:17 1998 Tim Janik <timj@gimp.org>
to leak memory, for dynamically allocated keys (problem pinpointed by
Mattias Gronlund).
>>>>>>> 1.218
Tue Mar 10 23:02:42 1998 Owen Taylor <owt1@cornell.edu>
* gdk/gdkdnd.c gtk/gtkclist.c gtk/gtksignal.c gtk/testgtk.c:
......
docs/gtk.texi
View file @ 9a9070c2
......@@ -953,6 +953,10 @@ structure directly (or, for that matter, any type derived from
@subsection Description
Ensure that the child window has a specified aspect ratio or, if
obey_child, has the same aspect ratio as its requested size. Derived
from @pxref{GtkFrame}).
@subsection Options
@defopt label
......@@ -1326,6 +1330,10 @@ function in the @var{widget} variable.
@subsection Description
A pressable button. Contains a widget. Changes its appearance
(hilites) when it gets the focus. Changes its appearance (pressed) when
activated. Derived from @pxref{GtkContainer}.
@subsection Signals
@deftypefn Signal void GtkButton::pressed (GtkButton *@var{button})
......@@ -1386,6 +1394,10 @@ pointer to a @code{GtkWidget} object. @code{NULL} is returned on failure.
@subsection Description
Another form of toggle button (@pxref{GtkToggleButton}) with an
indicator. Contains a widget to the right of the indicator. Changes
its appearance (hilites) when it gets the focus.
@subsection Options
@subsection Signals
......@@ -1426,6 +1438,11 @@ values @var{label}. The new widget is returned as a pointer to a
@subsection Description
Derived from @pxref{GtkMenuItem}. Very similar to a checkbutton
(@pxref{GtkCheckButton}), except that it's a menu item. Has a toggled
state which is displayed in a small rectangle to the left of the
contained widget.
@subsection Options
@defopt label
......@@ -1471,6 +1488,11 @@ object. @code{NULL} is returned on failure.
@subsection Description
A list of rows of columns, with a title row. You can insert rows, and
delete rows. The user can scroll around and select a row. Derived from
@pxref{GtkContainer}. Cells can be empty, have a text and/or pixmap, or
be a widget.
@subsection Options
@subsection Signals
......@@ -1641,6 +1663,12 @@ This is much faster then removing each item separately with
@subsection Description
A widget that allows a user to pick a color in one of many ways. They
can click on a color wheel or saturation bar. They can change hue,
saturation, value, red, green, or blue with a slider, or by entering
values. Also allows the user to set an alpha (opacity) value. Derived
from @pxref{GtkVBox}.
@subsection Options
@defopt policy
@itemize @bullet
......@@ -1706,6 +1734,9 @@ to a @code{GtkWidget} object. @code{NULL} is returned on failure.
@subsection Description
Text input box which also lets you choose from pre-defined values from a
drop-down menu. Derived from @pxref{GtkHBox}.
@subsection Options
@subsection Signals
......@@ -1742,12 +1773,17 @@ a @code{GtkWidget} object. @code{NULL} is returned on failure.
@gtkstdmacros{Combo, COMBO}
@page
@node GtkContainer, GtkCurve, GtkCombo, Widgets
@node GtkContainer, GtkGammaCurve, GtkCurve, GtkCombo, Widgets
@comment node-name, next, previous, up
@section The container widget
@subsection Description
A base class for objects that are built out of other widgets. Many
widgets are containers. For example, a button contains a widget. That
widget might be a text label (usually is), or a pixmap, or even an hbox
which has a label and a pixmap.
@subsection Options
@defopt border_width
......@@ -1817,12 +1853,14 @@ Remove @var{widget} from @var{container}.
@gtkstdmacros{Container, CONTAINER}
@page
@node GtkCurve, GtkDialog, GtkContainer, Widgets
@node GtkCurve, GtkGammaCurve, GtkDialog, GtkContainer, Widgets
@comment node-name, next, previous, up
@section The curve widget
@subsection Description
Derived from @pxref{GtkDrawingArea}.
@subsection Options
@defopt type
......@@ -1867,7 +1905,39 @@ Create a new @code{GtkCurve} returning the new widget as a pointer to a
@gtkstdmacros{Curve, CURVE}
@page
@node GtkDialog, GtkDrawingArea, GtkCurve, Widgets
@node GtkGammaCurve, GtkCurve, GtkDialog, GtkContainer, Widgets
@comment node-name, next, previous, up
@section The gamma curve widget
@subsection Description
Lets the user edit a gamma curve (a one-to-one mapping usually used to
adjust the intensity of an image to the physical characteristics of the
output device). You can set the minimum and maximum values for input
and output. You can set the initial vector as well. You are guaranteed
that every input value will have a (not necessarily unique) output value
specified. Derived from @pxref{GtkVBox}. Makes use of @pxref{GtkCurve} to
draw the curve.
@subsection Options
@subsection Signals
@subsection Functions
@deftypefun guint gtk_gamma_curve_get_type (void)
Returns the @code{GtkGamma} type identifier.
@end deftypefun
@deftypefun GtkWidget* gtk_gamma_curve_new (void)
Create a new @code{GtkGamma} returning the new widget as a pointer to a
@code{GtkWidget} object.
@end deftypefun
@gtkstdmacros{GammaCurve, GAMMACURVE}
@page
@node GtkDialog, GtkDrawingArea, GtkGammaCurve, GtkCurve, Widgets
@comment node-name, next, previous, up
@section The dialog widget
......@@ -1902,6 +1972,9 @@ to a @code{GtkWidget} object. @code{NULL} is returned on failure.
@subsection Description
A base class for widgets that need a box to draw into. So far, only
used by GtkCurve.
@subsection Options
@defopt width
......@@ -1938,6 +2011,9 @@ Set the size of the @var{darea} widget, created previously, to @var{width} and @
@subsection Description
Enter text into this widget. Derived from @pxref{GtkEditable}. Can be
set so it isn't editable.
@subsection Options
@defopt max
......@@ -2025,6 +2101,8 @@ Returns the text that is contained in the @code{GtkEntry} as a pointer to a
@subsection Description
Derived from @pxref{GtkBin}. Used by @pxref{GtkTreeItem}.
@subsection Options
@subsection Signals
......@@ -3582,6 +3660,10 @@ Create a new @code{GtkText} object initializing it with the values in
@subsection Description
Another form of button (@pxref{GtkButton}) with two states: on and off.
The appearance is that of a button which stays pressed on the first
click, and is released on the second click.
@subsection Options
@defopt state
......
gtk/testgtk.c
View file @ 9a9070c2
......@@ -599,7 +599,7 @@ new_pixmap (char *filename,
pixmap = gdk_pixmap_create_from_xpm (window, &mask,
background,
"test.xpm");
filename);
wpixmap = gtk_pixmap_new (pixmap, mask);
return wpixmap;
......
tests/testgtk.c
View file @ 9a9070c2
......@@ -599,7 +599,7 @@ new_pixmap (char *filename,
pixmap = gdk_pixmap_create_from_xpm (window, &mask,
background,
"test.xpm");
filename);
wpixmap = gtk_pixmap_new (pixmap, mask);
return wpixmap;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment