daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply a cleanup patch by Kjartan Maraas (#341812)

Browse source 
2006-10-08  Matthias Clasen  <mclasen@redhat.com>

	* Apply a cleanup patch by Kjartan Maraas  (#341812)
This commit is contained in:
Matthias Clasen 2006-10-08 05:07:55 +00:00 • committed by Matthias Clasen
commit 07e7719441
83 changed files with 222 additions and 417 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.pre-1-2
View file

@ -7981,7 +7981,7 @@ Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwidget.h: * gtk/gtkwidget.h:
* gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop * gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop
the emission of the "add-accelerator" signal on a widget. this is the emission of the "add-accelerator" signal on a widget. this is
usefull to prevent accelerator installation on certain widgets. useful to prevent accelerator installation on certain widgets.
* gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu * gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu
labels left justified, by setting their alignment. stop accelerator labels left justified, by setting their alignment. stop accelerator

2
ChangeLog.pre-2-0
View file

@ -17108,7 +17108,7 @@ Tue Jan 16 13:13:13 GMT 2001 Tony Gale <gale@gtk.org>
Use fb_mem, fb_stride, fb_width, fb_height. Use fb_mem, fb_stride, fb_width, fb_height.
Added recompute_rowstride to reset the rowstride of all windows. Added recompute_rowstride to reset the rowstride of all windows.
Added gdk_fb_recompute_all() which recomputes rootwindow size, Added gdk_fb_recompute_all() which recomputes rootwindow size,
window abs positions and window rowstrides. Usefull when the window abs positions and window rowstrides. Useful when the
rotation has changed. rotation has changed.
Thu Jan 11 13:16:50 GMT 2001 Tony Gale <gale@gtk.org> Thu Jan 11 13:16:50 GMT 2001 Tony Gale <gale@gtk.org>

2
HACKING
View file

@ -47,7 +47,7 @@ gtk+ and glib. You can do the following to get glib and gtk+ from cvs:
$ cvs -z3 checkout atk $ cvs -z3 checkout atk
$ cvs -z3 checkout gtk+ $ cvs -z3 checkout gtk+
For information about submitting patches and commiting changes For information about submitting patches and committing changes
to CVS, see the README and README.cvs-commits files. In particular, to CVS, see the README and README.cvs-commits files. In particular,
don't, under any circumstances, commit anything to CVS before don't, under any circumstances, commit anything to CVS before
reading and understanding README.cvs-commmits. reading and understanding README.cvs-commmits.

102
NEWS
View file

@ -453,10 +453,10 @@ Overview of Changes from GTK+ 2.9.0 to 2.9.1
* Arrow sizes in scrolled menus and notebooks are themable * Arrow sizes in scrolled menus and notebooks are themable
* GDK keysyms have be synched with Xorg 7.1 * GDK keysyms have be synced with Xorg 7.1
* Bugs fixed: * Bugs fixed:
340676 print backend type modules not correctly reregistering 340676 print backend type modules not correctly re-registering
their types their types
340870 gdk_window_get_toplevels docstring error 340870 gdk_window_get_toplevels docstring error
323956 Unwanted accelerate key in the action-based toolbar 323956 Unwanted accelerate key in the action-based toolbar
@ -475,7 +475,7 @@ Overview of Changes from GTK+ 2.9.0 to 2.9.1
MENU_SCROLL_ARROW_HEIGHT MENU_SCROLL_ARROW_HEIGHT
325282 Add GtkNotebook::tab-overlap style property 325282 Add GtkNotebook::tab-overlap style property
341247 possible crash with tab_label = NULL 341247 possible crash with tab_label = NULL
321896 Synch gdkkeysyms.h/gtkimcontextsimple.c with X.org 6.9/7.0 321896 Sync gdkkeysyms.h/gtkimcontextsimple.c with X.org 6.9/7.0
341416 Save FileChooserDialog doesn't response 341416 Save FileChooserDialog doesn't response
336774 gtk_recent_manager_add_full 336774 gtk_recent_manager_add_full
340401 critical warnings when using window groups 340401 critical warnings when using window groups
@ -536,9 +536,9 @@ Overview of Changes from GTK+ 2.8.x to 2.9.0
* GtkFileChooser: * GtkFileChooser:
- Communication with backends is now asynchronous to avoid - Communication with backends is now asynchronous to avoid
blocking on filesystem operations. Due to the required interface blocking on file system operations. Due to the required interface
changes, the GTK+ ABI version has been bumped to 2.10.0. Third-party changes, the GTK+ ABI version has been bumped to 2.10.0. Third-party
filesystem backends have to be ported to the new interface, other file system backends have to be ported to the new interface, other
modules, such as theme engines, input method modules or pixbuf loaders modules, such as theme engines, input method modules or pixbuf loaders
have to be rebuilt so that they are installed in the right place have to be rebuilt so that they are installed in the right place
for GTK+ to find them. for GTK+ to find them.
@ -575,7 +575,7 @@ Overview of Changes from GTK+ 2.8.x to 2.9.0
- The spacing of buttons around children can be themed with - The spacing of buttons around children can be themed with
the GtkButton::inner-border style property. Apps can override the GtkButton::inner-border style property. Apps can override
this per-widget using the corresponding inner-border property this per-widget using the corresponding inner-border property
- GtkMenu has aquired a horizontal-padding style property - GtkMenu has acquired a horizontal-padding style property
- There are style properties for the color of hyperlinks, - There are style properties for the color of hyperlinks,
GtkWidget::link-color and GtkWidget::visited-link-color GtkWidget::link-color and GtkWidget::visited-link-color
- GtkTreeview row hinting now takes the selection into account - GtkTreeview row hinting now takes the selection into account
@ -607,7 +607,7 @@ Overview of Changes from GTK+ 2.8.1 to GTK+ 2.8.2
================================================= =================================================
* Fix a crash with custom icon themes, which affected * Fix a crash with custom icon themes, which affected
the gnome-theme-manager. [Kjartan Maraas] the gnome-theme-manager. [Kjartan Maraas]
* Make sure font and cursor settings are propaged down * Make sure font and cursor settings are propagated down
to the screen initially. [Frederic Crozat] to the screen initially. [Frederic Crozat]
Overview of Changes from GTK+ 2.8.0 to GTK+ 2.8.1 Overview of Changes from GTK+ 2.8.0 to GTK+ 2.8.1
@ -644,7 +644,7 @@ Overview of Changes from GTK+ 2.7.5 to GTK+ 2.8.0
Overview of Changes from GTK+ 2.7.4 to GTK+ 2.7.5 Overview of Changes from GTK+ 2.7.4 to GTK+ 2.7.5
================================================= =================================================
* Rename the default theme to "Raleigh" [Thomas Wood] * Rename the default theme to "Raleigh" [Thomas Wood]
* Add a permformance testing framework [Federico Mena Quintero] * Add a performance testing framework [Federico Mena Quintero]
* Catch format errors in translations. This may cause * Catch format errors in translations. This may cause
"make check" to fail when using older versions "make check" to fail when using older versions
of gettext [Matthias] of gettext [Matthias]
@ -868,7 +868,7 @@ Overview of Changes from GTK+ 2.6.x to GTK+ 2.7.0
* Win32 changes * Win32 changes
- Improve keyboard handling [Tor Lillqvist] - Improve keyboard handling [Tor Lillqvist]
- Improve clipboard handling [Ivan Wong] - Improve clipboard handling [Ivan Wong]
- Do delayed rendering for transfering images - Do delayed rendering for transferring images
through the clipboard [Ivan Wong] through the clipboard [Ivan Wong]
- Improve tablet handling [Robert Ögren] - Improve tablet handling [Robert Ögren]
- Initialize input devices lazily [Robert Ögren] - Initialize input devices lazily [Robert Ögren]
@ -1000,10 +1000,10 @@ Overview of Changes from GTK+ 2.4.x to GTK+ 2.6.0
- Obey the Pango backspace-deletes-character attribute - Obey the Pango backspace-deletes-character attribute
* Changes in Clipboard/Selection/DND handling * Changes in Clipboard/Selection/DND handling
- Selection ownerchip change notification - Selection ownership change notification
- API to handle text, image and file targets - API to handle text, image and file targets
- Support text/plain target - Support text/plain target
- Support clipboard persistency - Support clipboard persistence
- Support xdnd v5 - Support xdnd v5
- Reduce clipboard timeout to 30 seconds - Reduce clipboard timeout to 30 seconds
@ -1022,7 +1022,7 @@ Overview of Changes from GTK+ 2.4.x to GTK+ 2.6.0
- License information for image loaders - License information for image loaders
- Disable loaders - Disable loaders
- Simple rotation - Simple rotation
- Make threadsafe - Make thread-safe
* Performance improvements * Performance improvements
- Increase chunk size for incremental selection transfers - Increase chunk size for incremental selection transfers
@ -1066,7 +1066,7 @@ Overview of Changes from GTK+ 2.5.6 to GTK+ 2.6.0
width of a label in characters [Christian Persch] width of a label in characters [Christian Persch]
* GtkIconView * GtkIconView
- Arrange items in a grid [Matthias] - Arrange items in a grid [Matthias]
- Convert hardcoded spacing constants into properties [Matthias] - Convert hard coded spacing constants into properties [Matthias]
* GtkCellRendererText * GtkCellRendererText
- Add ::width-chars property [James M. Cape] - Add ::width-chars property [James M. Cape]
* Win32 * Win32
@ -1084,7 +1084,7 @@ Overview of Changes from GTK+ 2.5.6 to GTK+ 2.6.0
Overview of Changes from GTK+ 2.5.5 to GTK+ 2.5.6 Overview of Changes from GTK+ 2.5.5 to GTK+ 2.5.6
================================================= =================================================
* GtkFileChooser * GtkFileChooser
- Improve keybindings [Davyd Madeley, Federico Mena Quintero] - Improve key bindings [Davyd Madeley, Federico Mena Quintero]
- Speed up loading of large directories [Federico] - Speed up loading of large directories [Federico]
- Move "Browse for other folders" expander up [Federico] - Move "Browse for other folders" expander up [Federico]
- Support DND from the path bar [Federico] - Support DND from the path bar [Federico]
@ -1141,7 +1141,7 @@ Overview of Changes from GTK+ 2.5.5 to GTK+ 2.5.6
Overview of Changes from GTK+ 2.5.4 to GTK+ 2.5.5 Overview of Changes from GTK+ 2.5.4 to GTK+ 2.5.5
================================================= =================================================
* gdk-pixbuf * gdk-pixbuf
- Make threadsafe [Colin Walters] - Make thread safe [Colin Walters]
* GtkFileChooser * GtkFileChooser
- Make tooltips work better [Matthias Clasen] - Make tooltips work better [Matthias Clasen]
- Show files (grayed out) in folder modes [Nickolay V. Shmyrev] - Show files (grayed out) in folder modes [Nickolay V. Shmyrev]
@ -1225,7 +1225,7 @@ Overview of Changes from GTK+ 2.5.3 to GTK+ 2.5.4
* Add a GtkMenuToolButton widget which displays a * Add a GtkMenuToolButton widget which displays a
dropdown menu from a toolbar button. [Paolo Borelli] dropdown menu from a toolbar button. [Paolo Borelli]
* Make menus scroll faster [Soeren Sandmann] * Make menus scroll faster [Soeren Sandmann]
* Allow themes to displace focus recangles in buttons * Allow themes to displace focus rectangles in buttons
on click [Soeren, Matthias] on click [Soeren, Matthias]
* Add a public setting for button ordering [Owen Taylor, Matthias] * Add a public setting for button ordering [Owen Taylor, Matthias]
* GtkImage * GtkImage
@ -1235,7 +1235,7 @@ Overview of Changes from GTK+ 2.5.3 to GTK+ 2.5.4
* Add a function to obtain the string representation of * Add a function to obtain the string representation of
accelerators used in GtkAccelLabel [John Spray, Matthias] accelerators used in GtkAccelLabel [John Spray, Matthias]
* Win32 bug fixes [Robert Ögren] * Win32 bug fixes [Robert Ögren]
- Fix commandline option handling [Tor Lillqvist] - Fix command line option handling [Tor Lillqvist]
- Make IME input method work better [Tor] - Make IME input method work better [Tor]
* Other bug fixes [Joel Fredrikson, Darren Creutz, * Other bug fixes [Joel Fredrikson, Darren Creutz,
Manish Singh, Matthias, Tristan Van Berkom, Christian Persch, Manish Singh, Matthias, Tristan Van Berkom, Christian Persch,
@ -1272,7 +1272,7 @@ Overview of Changes from GTK+ 2.5.2 to GTK+ 2.5.3
- Improve positioning of popups [Matthias] - Improve positioning of popups [Matthias]
* Make input methods respect editability [Noah Levitt] * Make input methods respect editability [Noah Levitt]
* Add an setting to specify modules to load [Alex Graveley] * Add an setting to specify modules to load [Alex Graveley]
* Use GOption for commandline argument parsing [Anders Carlsson] * Use GOption for command line argument parsing [Anders Carlsson]
* Default theme * Default theme
- Improve drawing of expanders [Matthias Clasen] - Improve drawing of expanders [Matthias Clasen]
* Add a configure option to disable the use of ELF visibility * Add a configure option to disable the use of ELF visibility
@ -1307,7 +1307,7 @@ Overview of Changes from GTK+ 2.5.1 to GTK+ 2.5.2
for use in preference dialogs. [James M. Cape] for use in preference dialogs. [James M. Cape]
* GtkFileChooser * GtkFileChooser
- Add getter and setter for the ::show-hidden property [Jeff Franks] - Add getter and setter for the ::show-hidden property [Jeff Franks]
- Allow paths to be entered as part of the filename. [Federico Mena Quintero] - Allow paths to be entered as part of the file name. [Federico Mena Quintero]
- Make separator in bookmarks pane unselectable [Matthias Clasen] - Make separator in bookmarks pane unselectable [Matthias Clasen]
- Improve activation on focus [Federico] - Improve activation on focus [Federico]
- Avoid warnings when opened on non-default screens [Abel Daniel] - Avoid warnings when opened on non-default screens [Abel Daniel]
@ -1415,7 +1415,7 @@ Overview of Changes from GTK+ 2.4.1 to GTK+ 2.5.0
- always show icons [Federico] - always show icons [Federico]
- bug fixes [Federico, Christian Neumair, Alex Roitman] - bug fixes [Federico, Christian Neumair, Alex Roitman]
* GtkComboBox, GtkComboBoxEntry * GtkComboBox, GtkComboBoxEntry
- add missing getters and some more convience API [Matthias, - add missing getters and some more convenience API [Matthias,
Christian Neumeir, Oliver Andrieu] Christian Neumeir, Oliver Andrieu]
- improve placement and sizing of popups [Matthias] - improve placement and sizing of popups [Matthias]
- support insensitive items [Matthias] - support insensitive items [Matthias]
@ -1430,7 +1430,7 @@ Overview of Changes from GTK+ 2.4.1 to GTK+ 2.5.0
- support inline autocompletion [Matthias] - support inline autocompletion [Matthias]
* GtkUIManager * GtkUIManager
- fix signal registration [Michael Natterer] - fix signal registration [Michael Natterer]
- make generated XML parseable [Sven Neumann] - make generated XML parsable [Sven Neumann]
- fix get_widget to return menus [Matthias] - fix get_widget to return menus [Matthias]
* GtkTreeView * GtkTreeView
- hover-selection mode [Matthias] - hover-selection mode [Matthias]
@ -1905,7 +1905,7 @@ Overview of Changes from GTK+-2.2.x to GTK+-2.3.0
- Add internals documentation [Havoc Pennington] - Add internals documentation [Havoc Pennington]
* GtkToolbar [Soeren] * GtkToolbar [Soeren]
- Add a more constistent and extensible toolbar API; preserve - Add a more consistent and extensible toolbar API; preserve
old API for backwards compatibility [James, Anders Carlsson, Owen] old API for backwards compatibility [James, Anders Carlsson, Owen]
- Support for sliding buttons like OS X - Support for sliding buttons like OS X
- Keyboard navigation - Keyboard navigation
@ -2018,7 +2018,7 @@ Overview of Changes in GTK+ 2.2.3
field of a XKB event as a window ID and found a pixmap that matched. field of a XKB event as a window ID and found a pixmap that matched.
[Owen Taylor, with essential backtrace from Kjartan Maraas] [Owen Taylor, with essential backtrace from Kjartan Maraas]
- Fix CapsLock and NumLock for non-XKB [Robert Basch] - Fix CapsLock and NumLock for non-XKB [Robert Basch]
- Fix problems with, eg. Ctrl-Alt-Backspace hiding Cntrl-Backspace [Owen] - Fix problems with, eg. Ctrl-Alt-Backspace hiding Ctrl-Backspace [Owen]
- Workaround Xinerama servers reporting wrong depths [Owen] - Workaround Xinerama servers reporting wrong depths [Owen]
* GtkTreeView [Kristian Rietveld] * GtkTreeView [Kristian Rietveld]
- Fix scrolling once more [Pedro Gimeno, Michael Natterer, Timo Sirainen] - Fix scrolling once more [Pedro Gimeno, Michael Natterer, Timo Sirainen]
@ -2086,7 +2086,7 @@ Overview of Changes in GTK+ 2.2.2
- Work around RENDER extension bugs on certain Sun X servers [Morten Welinder] - Work around RENDER extension bugs on certain Sun X servers [Morten Welinder]
- Zero unused fields in client messages we send Lubos Lunak] - Zero unused fields in client messages we send Lubos Lunak]
- Fix occasional segfault when drawing pixbufs [Hans Petter Jansson] - Fix occasional segfault when drawing pixbufs [Hans Petter Jansson]
- Fix wrong initializaiton that was keeping XShm from being used. - Fix wrong initialization that was keeping XShm from being used.
* Win32 backend [Tor Lillqvist] * Win32 backend [Tor Lillqvist]
- Tweak line drawing - Tweak line drawing
- Mouse/cursor fixes [Allin Cottrell] - Mouse/cursor fixes [Allin Cottrell]
@ -2269,7 +2269,7 @@ Widget improvements:
- Privatize gtk_tree_store_move(), add gtk_tree_store_move_before/after() - Privatize gtk_tree_store_move(), add gtk_tree_store_move_before/after()
- Add GTK_CELL_RENDERER_FOCUSED flag - Add GTK_CELL_RENDERER_FOCUSED flag
- Keynav fixes, including adding boolean return values for keybinding - Keynav fixes, including adding boolean return values for keybinding
signals (API breakage for API that noone should have been using) signals (API breakage for API that no one should have been using)
[Narayana Pattipati] [Narayana Pattipati]
- Add gtk_tree_view_column_cell_get_position() - Add gtk_tree_view_column_cell_get_position()
- Add an inconsistent state for GtkCellRendererToggle - Add an inconsistent state for GtkCellRendererToggle
@ -2615,7 +2615,7 @@ Overview of Changes in GTK+ 2.0.0 rc1
* Try to fix key handling without XKEYBOARD extension [Owen] * Try to fix key handling without XKEYBOARD extension [Owen]
* Documentation fixes and improvements * Documentation fixes and improvements
[Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov] [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
* Widget drawing improvments [Soeren Sandmann] * Widget drawing improvements [Soeren Sandmann]
* Allow cycling between multiple menu bars with <Control>Tab [Owen] * Allow cycling between multiple menu bars with <Control>Tab [Owen]
* Try to build libraries with only shared library dependencies on Xft to * Try to build libraries with only shared library dependencies on Xft to
deal with transition to Xft2 [Owen] deal with transition to Xft2 [Owen]
@ -2683,7 +2683,7 @@ Overview of Changes in GTK+ 1.3.14
* Fix GtkCalendar focus drawing [Bill Haneman] * Fix GtkCalendar focus drawing [Bill Haneman]
* Allow themeable cursor thickness [Bill] * Allow themeable cursor thickness [Bill]
* Start of fixing of tutorial for GTK+-2.0 [Matthias] * Start of fixing of tutorial for GTK+-2.0 [Matthias]
* Add a ::adjust-bounds signal to GtkRange to allow spreadsheat style * Add a ::adjust-bounds signal to GtkRange to allow spreadsheet style
scrollbars. [Jody Goldberg] scrollbars. [Jody Goldberg]
* Add the ability to turn on multiple selection for GtkFileSel [Manish] * Add the ability to turn on multiple selection for GtkFileSel [Manish]
* Bug fixes * Bug fixes
@ -2781,7 +2781,7 @@ Overview of Changes in GTK+ 1.3.11
functions (Owen, Damian Ivereigh) functions (Owen, Damian Ivereigh)
* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen) * Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
* Change button ordering in standard dialogs to correspond to * Change button ordering in standard dialogs to correspond to
GNOME useability project proposal (Gregory Merchan) GNOME usability project proposal (Gregory Merchan)
* Add support for context sensitivity in input methods (Owen) * Add support for context sensitivity in input methods (Owen)
* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima) * Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
* Fix gdk_window_scroll() and other aspects of big windows (Owen) * Fix gdk_window_scroll() and other aspects of big windows (Owen)
@ -2815,7 +2815,7 @@ Overview of Changes in GTK+ 1.3.10
* Support text chunks for the PGN loader, add gdk_pixbuf_get_option() * Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
[Sven Neumann] [Sven Neumann]
* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen] * Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
* Automatically call setlocale(), unless explictely disabled [Owen] * Automatically call setlocale(), unless explicitly disabled [Owen]
* Property addition to various widgets [Michael Meeks, Owen] * Property addition to various widgets [Michael Meeks, Owen]
* Support building with automake-1.4 [James] * Support building with automake-1.4 [James]
* Make GtkRadioButton groups act as a single focus point [Owen] * Make GtkRadioButton groups act as a single focus point [Owen]
@ -2946,7 +2946,7 @@ Overview of Changes in GTK+ 1.3.5
* XEMBED-based GtkPlug/GtkSocket now basically works. * XEMBED-based GtkPlug/GtkSocket now basically works.
* Drag and drop of column headers in GtkTreeView * Drag and drop of column headers in GtkTreeView
* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks, * GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
and API sanitization and API sanitation
* Key binding fixes * Key binding fixes
* Configurable padding/spacing in a lot of places * Configurable padding/spacing in a lot of places
* Invisible text in GtkTextView fixed * Invisible text in GtkTextView fixed
@ -3016,7 +3016,7 @@ Widgets:
scrolling menus. [Alex] scrolling menus. [Alex]
* Simplification of progress bar API. [Havoc] * Simplification of progress bar API. [Havoc]
* Make GtkImage a generic image-display widget. [Havoc] * Make GtkImage a generic image-display widget. [Havoc]
* New GtkTreeView tree widget. Model/view architecture, flexible renderering, * New GtkTreeView tree widget. Model/view architecture, flexible rendering,
large datasets, etc. [Jonathan] large datasets, etc. [Jonathan]
* New GtkMessageBox widget for message display. [Havoc] * New GtkMessageBox widget for message display. [Havoc]
* Allow labels to have contents set from XML-like markup language. [Havoc] * Allow labels to have contents set from XML-like markup language. [Havoc]
@ -3026,8 +3026,8 @@ Internationalization:
* Proper character set conversion for clipboard/selection. [Owen] * Proper character set conversion for clipboard/selection. [Owen]
* New input method system via loadable modules; support on-the-spot * New input method system via loadable modules; support on-the-spot
preedit in GtkEntry and new text widget; allow switchin input methods preedit in GtkEntry and new text widget; allow switching input methods
on the fly; include modules for XIM and demo Cyrillic-tranliteration on the fly; include modules for XIM and demo Cyrillic-transliteration
module. [Owen] module. [Owen]
* VIQR, Thai, and Inuktitut input methods. [Robert] * VIQR, Thai, and Inuktitut input methods. [Robert]
* Convert po files to UTF-8. [Robert] * Convert po files to UTF-8. [Robert]
@ -3096,7 +3096,7 @@ Overview of Changes in GTK+ 1.2.6:
* gtk[vh]scale: minor fixups * gtk[vh]scale: minor fixups
* rename idle to idle_id in testgtk to avoid conflicts with * rename idle to idle_id in testgtk to avoid conflicts with
broken libs broken libs
* More consistant naming of gtkrc files * More consistent naming of gtkrc files
* Added language support: ro, uk * Added language support: ro, uk
Overview of Changes in GTK+ 1.2.5: Overview of Changes in GTK+ 1.2.5:
@ -3110,7 +3110,7 @@ Overview of Changes in GTK+ 1.2.5:
* check for 5.002 now, to avoid failing autogeneration build rules due * check for 5.002 now, to avoid failing autogeneration build rules due
to old perl versions. to old perl versions.
* fonts (and fontsets) are cached now. * fonts (and fontsets) are cached now.
* more autogeneration make rules and dependancy fixups, we should be * more autogeneration make rules and dependency fixups, we should be
save with autogeneration up to make -j12 now ;) save with autogeneration up to make -j12 now ;)
* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the * new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
GtkWindow on every size change. GtkWindow on every size change.
@ -3118,7 +3118,7 @@ Overview of Changes in GTK+ 1.2.5:
races with the new resizing code. races with the new resizing code.
* the new wm hints and resizing code is absolutely perfect and bug free now, * the new wm hints and resizing code is absolutely perfect and bug free now,
it only lacks testing ;) it only lacks testing ;)
* fixed up various rc style memory prolems. * fixed up various rc style memory problems.
* gtk_widget_modify_style() now properly changes the style of realized widgets * gtk_widget_modify_style() now properly changes the style of realized widgets
and references the style passed into it. if people worked around this bug, and references the style passed into it. if people worked around this bug,
this will introduce a slight memory leak in their code. this will introduce a slight memory leak in their code.
@ -3162,17 +3162,17 @@ Overview of Changes in GTK+ 1.2.2:
* Bug fixes for the Gtk selection code. * Bug fixes for the Gtk selection code.
* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option). * Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
* Bug fixes and leak plugs for the Gdk IM code. * Bug fixes and leak plugs for the Gdk IM code.
* Added gtk_object_get() facility to retrive object arguments easily. * Added gtk_object_get() facility to retrieve object arguments easily.
The var args list expects ("arg-name", &value) pairs. The var args list expects ("arg-name", &value) pairs.
* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix * Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
problems where closed pipes were no longer signalling GDK_INPUT_READ on problems where closed pipes were no longer signaling GDK_INPUT_READ on
systems with a native poll(). systems with a native poll().
* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory * Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
anymore). anymore).
* We don't attempt to lookup xpm color "None" anymore, this should prevent * We don't attempt to lookup xpm color "None" anymore, this should prevent
eXodus (commercial X windows server) from popping up a color dialog every eXodus (commercial X windows server) from popping up a color dialog every
time a transparent pixmap is created. time a transparent pixmap is created.
* Fixed bug where Gtk timout/idle handlers would execute without the global * Fixed bug where Gtk timeout/idle handlers would execute without the global
Gdk lock being held. Gdk lock being held.
* Other minor bug fixes. * Other minor bug fixes.
@ -3182,7 +3182,7 @@ Overview of Changes in GTK+ 1.2.1:
* GtkItemFactory can "adopt" foreign menu items now and manage their * GtkItemFactory can "adopt" foreign menu items now and manage their
accelerator installation. This is often required to get GtkItemFactory accelerator installation. This is often required to get GtkItemFactory
like accelerator propagation between different windows with the same like accelerator propagation between different windows with the same
menu heirarchy and for centralized parsing and saving of accelerators. menu hierarchy and for centralized parsing and saving of accelerators.
* GtkCList/GtkCTree buttons should always display correctly now. * GtkCList/GtkCTree buttons should always display correctly now.
* Miscellaneous other bug fixes. * Miscellaneous other bug fixes.
@ -3215,7 +3215,7 @@ Overview of Changes in GTK+ 1.1.16:
This correct various bugs with gtk_widget_set_usize(). This correct various bugs with gtk_widget_set_usize().
* Fixes for XIM on X11R5 systems * Fixes for XIM on X11R5 systems
* Don't allow cut-and-paste of text in password-style entries * Don't allow cut-and-paste of text in password-style entries
* --enable-debug is now on by default for the development releaes. * --enable-debug is now on by default for the development release.
(When compiling for "production", use --enable-debug=minimum) (When compiling for "production", use --enable-debug=minimum)
* Handle systems where Helvetica is not present more gracefully * Handle systems where Helvetica is not present more gracefully
* Fixes for memory leaks * Fixes for memory leaks
@ -3244,7 +3244,7 @@ What is new in GTK+ 1.1.14:
* Fixes to make gtk_radio_button_set_group() keep only * Fixes to make gtk_radio_button_set_group() keep only
one radio button in the group active one radio button in the group active
* Foreign windows are now always treated as viewable; this fixes * Foreign windows are now always treated as viewable; this fixes
a problem where updating didn't occure properly in GtkPlug a problem where updating didn't occur properly in GtkPlug
* DND fixes for 64 bit architectures, and for specifying operations * DND fixes for 64 bit architectures, and for specifying operations
with modifier keys. with modifier keys.
* Major revisions to GtkLayout: avoid having to create window * Major revisions to GtkLayout: avoid having to create window
@ -3259,7 +3259,7 @@ What is new in GTK+ 1.1.13:
* Tooltips windows are now named "gtk-tooltips" so rc file rules * Tooltips windows are now named "gtk-tooltips" so rc file rules
can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
widgets. widgets.
* Spin buttons now update their values upon value retrival. * Spin buttons now update their values upon value retrieval.
* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs * Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
a lot. Gtk makes full use of the draw_area coalescing code now, which a lot. Gtk makes full use of the draw_area coalescing code now, which
got minorly improved as well. got minorly improved as well.
@ -3323,14 +3323,14 @@ What is new in GTK+ 1.1.7:
* Various event handling fixes * Various event handling fixes
* Wide character support for entry and text * Wide character support for entry and text
* Destroy widgets _after_ propagating unrealize signals through * Destroy widgets _after_ propagating unrealize signals through
widget heirarchy widget hierarchy
* Only build XIM-support if available * Only build XIM-support if available
* Tutorial and examples updates * Tutorial and examples updates
* Added gtk_drag_source_unset() * Added gtk_drag_source_unset()
What is new in GTK+ 1.1.6: What is new in GTK+ 1.1.6:
* The signal system now features emission hooks whith special semantics, * The signal system now features emission hooks with special semantics,
refer to the ChangeLog for this. refer to the ChangeLog for this.
* Minor? speedups and memory reductions to the emission handling of the * Minor? speedups and memory reductions to the emission handling of the
signal system. signal system.
@ -3363,13 +3363,13 @@ What is new in GTK+ 1.1.5:
* Queued redraws of partial areas * Queued redraws of partial areas
* Scrolledwindow (+Viewport) source incompatibilities, children that are added * Scrolledwindow (+Viewport) source incompatibilities, children that are added
to a scrolled window don't get an automatic viewport anymore. a convenience to a scrolled window don't get an automatic viewport anymore. a convenience
function gtk_scrolled_window_add_with_viewport() is suplied for this task function gtk_scrolled_window_add_with_viewport() is supplied for this task
* Deprecated functions will now issue a message, informing the programmer about * Deprecated functions will now issue a message, informing the programmer about
the use of this function. These functions will get removed in future versions the use of this function. These functions will get removed in future versions
* Non-functional functions got removed entirely * Non-functional functions got removed entirely
* gtk_widget_new() and gtk_object_new() will now auto-construct new objects. * gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
A new function gtk_object_default_construct() is provided now which should A new function gtk_object_default_construct() is provided now which should
be called after every gtk_type_new() to perfom the auto-construction be called after every gtk_type_new() to perform the auto-construction
* Improved argument support of several widgets * Improved argument support of several widgets
* Bug Fixes * Bug Fixes
@ -3386,7 +3386,7 @@ What is new in GTK+ 1.1.3:
* Must enhanced DND support, removed old DND code * Must enhanced DND support, removed old DND code
* Idle functions are now implemented via GHook, giving a slight speed * Idle functions are now implemented via GHook, giving a slight speed
improvement improvement
* An environment variable GTK_MODULES which takes a colon seperated * An environment variable GTK_MODULES which takes a colon separated
list of module names GTK+ will now automatically load at gtk_init() startup list of module names GTK+ will now automatically load at gtk_init() startup
* GtkFontSel now has support for an extra 'base' filter * GtkFontSel now has support for an extra 'base' filter
* New function gdk_window_set_root_origin to get the real geometry taking * New function gdk_window_set_root_origin to get the real geometry taking
@ -3400,7 +3400,7 @@ What is new in GTK+ 1.1.3:
* New widget GtkInvisible - InputOnly offscreen windows used for reliable * New widget GtkInvisible - InputOnly offscreen windows used for reliable
pointer grabs and selection handling in DND code pointer grabs and selection handling in DND code
* New functions gtk_object_remove_no_notify[_by_id] to remove a certain * New functions gtk_object_remove_no_notify[_by_id] to remove a certain
data portion without invokation of its destroy notifier data portion without invocation of its destroy notifier
* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure * gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
instead instead
* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type * gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type
@ -3460,7 +3460,7 @@ What is new in GTK+ 1.1.1:
What is new in GTK+ 1.1.0: What is new in GTK+ 1.1.0:
* New widget GtkFontSelector. * New widget GtkFontSelector.
* New featurefull progress bar. * New featureful progress bar.
* New container widget GtkPacker. * New container widget GtkPacker.
* New object GtkItemFactory, GtkMenuFactory is deprecated. * New object GtkItemFactory, GtkMenuFactory is deprecated.
* New key binding system, configurable via rcfiles, similar to styles. * New key binding system, configurable via rcfiles, similar to styles.
@ -3482,7 +3482,7 @@ What is new in GTK+ 1.1.0:
* Child arguments support for container widgets. * Child arguments support for container widgets.
* Far better support for object arguments, revamp of the underlying * Far better support for object arguments, revamp of the underlying
mechanism for speed and reusability. Child/object arguments don't mechanism for speed and reusability. Child/object arguments don't
need to be preceeded by the "GtkType::" portion anymore. need to be preceded by the "GtkType::" portion anymore.
* Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display * Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display
is now performed by a new widget GtkAccelLabel. is now performed by a new widget GtkAccelLabel.
* Overhaul of the resizing code. Resizing behaviour can now be specified * Overhaul of the resizing code. Resizing behaviour can now be specified

14
README
View file

@ -126,7 +126,7 @@ Release notes for 2.8
Release notes for 2.6 Release notes for 2.6
===================== =====================
* GTK+ 2.6 supports clipboard persistency. To make use of this feature, * GTK+ 2.6 supports clipboard persistence. To make use of this feature,
a clipboard manager following the specification at a clipboard manager following the specification at
http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec http://www.freedesktop.org/wiki/Standards/clipboard-manager-spec
must be running. A sample implementation of such a clipboard manager must be running. A sample implementation of such a clipboard manager
@ -137,11 +137,11 @@ Release notes for 2.6
* Notification on clipboard ownership changes via GdkOwnerChange events * Notification on clipboard ownership changes via GdkOwnerChange events
requires the XFIXES X extension. Applications can use the function requires the XFIXES X extension. Applications can use the function
gdk_display_supports_selection_notification() to find out if ownerchip gdk_display_supports_selection_notification() to find out if ownership
change notification is available. change notification is available.
* The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme * The icon theme code in GTK+ 2.6 follows the freedesktop.org icon theme
specification. Setting the XDG_DATA_DIRS environtment variable may be specification. Setting the XDG_DATA_DIRS environment variable may be
necessary if your icons aren't installed in the default location necessary if your icons aren't installed in the default location
/usr/share/icons. /usr/share/icons.
@ -151,7 +151,7 @@ Release notes for 2.6
see the gtk-update-icon-cache man page or the GTK+ documentation. see the gtk-update-icon-cache man page or the GTK+ documentation.
* To reduce code size and improve efficiency, GTK+, when compiled * To reduce code size and improve efficiency, GTK+, when compiled
with the GNU toolchain, has separate internal and external entry with the GNU tool chain, has separate internal and external entry
points for exported functions. The internal names, which begin with points for exported functions. The internal names, which begin with
IA__, may be seen when debugging a GTK+ program. IA__, may be seen when debugging a GTK+ program.
@ -179,7 +179,7 @@ Release notes for 2.6
compatibility are provided. compatibility are provided.
* On Unix, the assumption of GLib and GTK+ by default is that filenames on * On Unix, the assumption of GLib and GTK+ by default is that filenames on
the filesystem are encoded in UTF-8 rather than the encoding of the locale; the file system are encoded in UTF-8 rather than the encoding of the locale;
the GTK+ developers consider that having filenames whose interpretation the GTK+ developers consider that having filenames whose interpretation
depends on the current locale is fundamentally a bad idea. depends on the current locale is fundamentally a bad idea.
@ -197,7 +197,7 @@ Release notes for 2.6
On Windows, filenames passed to GTK+ should always be in UTF-8, as On Windows, filenames passed to GTK+ should always be in UTF-8, as
in GLib 2.6. This is different than in previous versions of GTK+ in GLib 2.6. This is different than in previous versions of GTK+
where the system codepage was used. As in GLib, for DLL ABI where the system code page was used. As in GLib, for DLL ABI
stability, applications built against previous versions of GTK+ will stability, applications built against previous versions of GTK+ will
use entry points providing the old semantics. use entry points providing the old semantics.
@ -233,7 +233,7 @@ In the bug report please include:
that can be downloaded. that can be downloaded.
* If the bug was a crash, the exact text that was printed out when the * If the bug was a crash, the exact text that was printed out when the
crash occured. crash occurred.
* Further information such as stack traces may be useful, but is not * Further information such as stack traces may be useful, but is not
necessary. If you do send a stack trace, and the error is an X error, necessary. If you do send a stack trace, and the error is an X error,

6
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
View file

@ -152,7 +152,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
guint8 *s;
register guint8 data; register guint8 data;
guint8 *o; guint8 *o;
guint8 *srow = image->data, *orow = pixels; guint8 *srow = image->data, *orow = pixels;
@ -167,7 +166,6 @@ rgb1 (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
bpl = image->bytes_per_line; bpl = image->bytes_per_line;
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
@ -191,7 +189,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
int xx, yy; int xx, yy;
int width, height; int width, height;
int bpl; int bpl;
guint8 *s;
register guint8 data; register guint8 data;
guint8 *o; guint8 *o;
guint8 *srow = image->data, *orow = pixels; guint8 *srow = image->data, *orow = pixels;
@ -221,7 +218,6 @@ rgb1a (XImage *image, guchar *pixels, int rowstride, xlib_colormap *colormap)
} }
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx ++) { for (xx = 0; xx < width; xx ++) {
@ -988,7 +984,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
int width, height; int width, height;
int bpl; int bpl;
guint8 *srow = image->data, *orow = pixels; guint8 *srow = image->data, *orow = pixels;
guint8 *s;
guint8 *o; guint8 *o;
guint32 pixel; guint32 pixel;
Visual *v; Visual *v;
@ -1011,7 +1006,6 @@ convert_real_slow (XImage *image, guchar *pixels, int rowstride, xlib_colormap *
red_prec, green_prec, blue_prec)); red_prec, green_prec, blue_prec));
for (yy = 0; yy < height; yy++) { for (yy = 0; yy < height; yy++) {
s = srow;
o = orow; o = orow;
for (xx = 0; xx < width; xx++) { for (xx = 0; xx < width; xx++) {
pixel = XGetPixel (image, xx, yy); pixel = XGetPixel (image, xx, yy);

2
demos/gtk-demo/appwindow.c
View file

@ -156,7 +156,7 @@ typedef struct
GtkActionClass parent_class; GtkActionClass parent_class;
} ToolMenuActionClass; } ToolMenuActionClass;
G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION); G_DEFINE_TYPE(ToolMenuAction, tool_menu_action, GTK_TYPE_ACTION)
static void static void
tool_menu_action_class_init (ToolMenuActionClass *class) tool_menu_action_class_init (ToolMenuActionClass *class)

9
demos/gtk-demo/hypertext.c
View file

@ -165,9 +165,9 @@ event_after (GtkWidget *text_view,
return FALSE; return FALSE;
} }
gboolean hovering_over_link = FALSE; static gboolean hovering_over_link = FALSE;
GdkCursor *hand_cursor = NULL; static GdkCursor *hand_cursor = NULL;
GdkCursor *regular_cursor = NULL; static GdkCursor *regular_cursor = NULL;
/* Looks at all tags covering the position (x, y) in the text view, /* Looks at all tags covering the position (x, y) in the text view,
* and if one of them is a link, change the cursor to the "hands" cursor * and if one of them is a link, change the cursor to the "hands" cursor
@ -179,12 +179,9 @@ set_cursor_if_appropriate (GtkTextView *text_view,
gint y) gint y)
{ {
GSList *tags = NULL, *tagp = NULL; GSList *tags = NULL, *tagp = NULL;
GtkTextBuffer *buffer;
GtkTextIter iter; GtkTextIter iter;
gboolean hovering = FALSE; gboolean hovering = FALSE;
buffer = gtk_text_view_get_buffer (text_view);
gtk_text_view_get_iter_at_location (text_view, &iter, x, y); gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
tags = gtk_text_iter_get_tags (&iter); tags = gtk_text_iter_get_tags (&iter);

2
demos/testpixbuf-drawable.c
View file

@ -66,7 +66,7 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
return FALSE; return FALSE;
} }
extern void pixbuf_init (); extern void pixbuf_init (void);
int int
main (int argc, char **argv) main (int argc, char **argv)

4
demos/testpixbuf.c
View file

@ -358,11 +358,11 @@ expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
static void static void
config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data) config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
{ {
#if 0
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf"); pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
#if 0
if (((event->width) != gdk_pixbuf_get_width (pixbuf)) || if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
((event->height) != gdk_pixbuf_get_height (pixbuf))) ((event->height) != gdk_pixbuf_get_height (pixbuf)))
gdk_pixbuf_scale (pixbuf, event->width, event->height); gdk_pixbuf_scale (pixbuf, event->width, event->height);
@ -504,7 +504,7 @@ progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint w
static int readlen = 4096; static int readlen = 4096;
extern void pixbuf_init (); extern void pixbuf_init (void);
void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data) void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
{ {

6
docs/README.linux-fb
View file

@ -32,7 +32,7 @@ Freetype can be found at ftp://ftp.freetype.org
Hardware requirements: Hardware requirements:
---------------------- ----------------------
You need a graphics card with an availible framebuffer driver that can You need a graphics card with an available framebuffer driver that can
run in 8, 16, 24 or 32 bpp. I use the matroxfb driver, but i.e. vesafb run in 8, 16, 24 or 32 bpp. I use the matroxfb driver, but i.e. vesafb
should work too. You also need a supported mouse. Currently supported should work too. You also need a supported mouse. Currently supported
is ps2 mouse, ms serial mouse and fidmour touchscreen. is ps2 mouse, ms serial mouse and fidmour touchscreen.
@ -44,7 +44,7 @@ First build and install glib and pango as usual, in that order.
Then configure Gtk by running configure (or autogen.sh if running from Then configure Gtk by running configure (or autogen.sh if running from
cvs) with --with-gdktarget=linux-fb. cvs) with --with-gdktarget=linux-fb.
Then compile as ususal: make; make install Then compile as usual: make; make install
Fonts: Fonts:
------ ------
@ -124,7 +124,7 @@ GDK_MOUSE_TYPE:
Default is ps2. Default is ps2.
GDK_KEYBOARD_TYPE: GDK_KEYBOARD_TYPE:
Specify keyboard type. Currently suppored is Specify keyboard type. Currently supported is
xlate - normal tty mode keyboard. xlate - normal tty mode keyboard.
Quite limited, cannot detect key up/key down events. Doesn't Quite limited, cannot detect key up/key down events. Doesn't
handle ctrl/alt/shift for all keys. This is the default driver, handle ctrl/alt/shift for all keys. This is the default driver,

6
docs/developers.txt
View file

@ -6,7 +6,7 @@ programming for/with Gtk, having the spirit of a developers FAQ.
It is also the correct place to list up things that programmers should It is also the correct place to list up things that programmers should
care about in general. care about in general.
In the hope that this text might be usefull to someone, In the hope that this text might be useful to someone,
- Tim Janik <timj@gimp.org> - Tim Janik <timj@gimp.org>
1998/02/11 1998/02/11
@ -43,7 +43,7 @@ GDK_SELECTION_CLEAR GtkWidget::selection_clear_event
GDK_FOCUS_CHANGE GtkWidget::focus_in_event GDK_FOCUS_CHANGE GtkWidget::focus_in_event
GtkWidget::focus_out_event GtkWidget::focus_out_event
Events that are asured to have a valid GdkEvent.any.window field are Events that are assured to have a valid GdkEvent.any.window field are
GDK_EXPOSE GtkWidget::expose_event GDK_EXPOSE GtkWidget::expose_event
@ -61,7 +61,7 @@ Writing Gdk functions
--------------------- ---------------------
When writing Gdk functions that operate on GdkWindow structures in any When writing Gdk functions that operate on GdkWindow structures in any
maeningfull sense, that is casting to a GdkWindowPrivate structure for meaningful sense, that is casting to a GdkWindowPrivate structure for
access to fields other then GdkWindow.user_data, the programmer is access to fields other then GdkWindow.user_data, the programmer is
recommended to check for the GdkWindowPrivate.destroyed field to be == recommended to check for the GdkWindowPrivate.destroyed field to be ==
FALSE, especially if the GdkWindowPrivate.xwindow field is used. FALSE, especially if the GdkWindowPrivate.xwindow field is used.

4
docs/dnd_internals.txt
View file

@ -112,7 +112,7 @@ Retrieves the selection that will be used to communicate
the data for the drag context (valid on both source the data for the drag context (valid on both source
and dest sides) and dest sides)
Cursors and window heirarchies Cursors and window hierarchies
============================== ==============================
The DND code, when possible (and it isn't possible over The DND code, when possible (and it isn't possible over
@ -123,7 +123,7 @@ the cursor is in _ourselves_ so we can ignore the
drag icon properly. (Oh for OutputOnly windows!) drag icon properly. (Oh for OutputOnly windows!)
To avoid obscene amounts of server traffic (which are only To avoid obscene amounts of server traffic (which are only
slighly observerable locally, but would really kill a slightly observable locally, but would really kill a
session over a slow link), the code in GDK does session over a slow link), the code in GDK does
XGetWindowAttributes for every child of the root window at XGetWindowAttributes for every child of the root window at
the beginning of the drag, then selects with the beginning of the drag, then selects with

2
docs/faq/gtk-faq.sgml
View file

@ -1636,7 +1636,7 @@ int main(int argc, char *argv[])
gtk_container_set_border_width(GTK_CONTAINER (window), 10); gtk_container_set_border_width(GTK_CONTAINER (window), 10);
#endif #endif
/* add a button to do something usefull */ /* add a button to do something useful */
button = gtk_button_new_with_label("Fork me!"); button = gtk_button_new_with_label("Fork me!");
g_signal_connect(G_OBJECT (button), "clicked", g_signal_connect(G_OBJECT (button), "clicked",

2
docs/faq/gtkfaq.sgml
View file

@ -1323,7 +1323,7 @@ int main(int argc, char *argv[])
gtk_container_set_border_width(GTK_CONTAINER (window), 10); gtk_container_set_border_width(GTK_CONTAINER (window), 10);
#endif #endif
/* add a button to do something usefull */ /* add a button to do something useful */
button = gtk_button_new_with_label("Fork me!"); button = gtk_button_new_with_label("Fork me!");
gtk_signal_connect(GTK_OBJECT (button), "clicked", gtk_signal_connect(GTK_OBJECT (button), "clicked",

2
docs/focus_tracking.txt
View file

@ -97,7 +97,7 @@ F2, F3: together these are exactly the cases where we get
F4: we get an LeaveNotify with the focus flag set. An F4: we get an LeaveNotify with the focus flag set. An
LeaveNotify with a focus flag set will also be sent if LeaveNotify with a focus flag set will also be sent if
F==W, so we have to to explicity test for that case F==W, so we have to to explicitly test for that case
using has_focus_window(W). using has_focus_window(W).

6
docs/generation.txt
View file

@ -107,7 +107,7 @@ makeenums.pl can be run into two modes:
2) Generate the enumeration portion of gtk.defs. 2) Generate the enumeration portion of gtk.defs.
The enumearation portion is added to the boxed type The enumeration portion is added to the boxed type
declarations in gtk-boxed.defs to create gtk.defs. declarations in gtk-boxed.defs to create gtk.defs.
The makeetypes.awk program takes the gtk.defs file, and The makeetypes.awk program takes the gtk.defs file, and
@ -162,7 +162,7 @@ The possible types are:
GtkDestroyNotify Notify) GtkDestroyNotify Notify)
Some of these types map to multiple return values - these Some of these types map to multiple return values - these
are marked above with the return types in parantheses. are marked above with the return types in parentheses.
NOTES NOTES
===== =====
@ -170,7 +170,7 @@ NOTES
When autogenerating GTK+ files, the autogenerated When autogenerating GTK+ files, the autogenerated
files are often rebuild resulting in the same result. files are often rebuild resulting in the same result.
To prevent unecessary rebuilds of the entire directory, some files To prevent unnecessary rebuilds of the entire directory, some files
that multiple other source files depend on are not actually written that multiple other source files depend on are not actually written
to directly. Instead, an intermediate file is written, which to directly. Instead, an intermediate file is written, which
is then compared to the old file, and only if it is different is then compared to the old file, and only if it is different

2
docs/gtk-config.txt
View file

@ -1,7 +1,7 @@
CONFIGURING PACKAGES TO WORK WITH GTK CONFIGURING PACKAGES TO WORK WITH GTK
------------------------------------- -------------------------------------
Compiling a program succesfully against the GTK, GDK, and GLIB Compiling a program successfully against the GTK, GDK, and GLIB
libraries can require a large number of command line options libraries can require a large number of command line options
to your compiler and linker that are hard to guess correctly. to your compiler and linker that are hard to guess correctly.
The additional libraries required may, for example, depend on the The additional libraries required may, for example, depend on the

14
docs/refcounting.txt
View file

@ -22,10 +22,10 @@ GtkObjects also provide the following functions:
GdkWindow GdkWindow
--------- ---------
A GdkWindow has to be explicitely destroyed with gdk_window_destroy. A GdkWindow has to be explicitly destroyed with gdk_window_destroy.
This will send out a request to destroy this window and all its This will send out a request to destroy this window and all its
children, and will decrement the ref_count of the GdkWindow by one. children, and will decrement the ref_count of the GdkWindow by one.
Thus, it releases the inital reference created by gdk_window_new. Thus, it releases the initial reference created by gdk_window_new.
All GdkWindows are kept in a hash table to translate from their XId to All GdkWindows are kept in a hash table to translate from their XId to
the actual structure and the pointer in the hash table is reflected in the actual structure and the pointer in the hash table is reflected in
@ -62,7 +62,7 @@ GdkVisual
--------- ---------
There are no *_new or *_destroy functions and the *_ref and *_unref There are no *_new or *_destroy functions and the *_ref and *_unref
functions are noops. GdkVisuals are static structures and thus do not functions are no-ops. GdkVisuals are static structures and thus do not
need reference counting. The ref counting functions are only there need reference counting. The ref counting functions are only there
for extra defensive programming. for extra defensive programming.
@ -220,13 +220,13 @@ Then, when the user wants to get rid of the window:
/* The GdkWindow of `window' and all its child GdkWindows are /* The GdkWindow of `window' and all its child GdkWindows are
* destroyed. * destroyed.
* *
* window is unregistered from the loplevel list and its ref_count * window is unregistered from the toplevel list and its ref_count
* drops to zero. The destroy code of `window' destroyes `option_menu'. * drops to zero. The destroy code of `window' destroys `option_menu'.
* *
* The destroy code of `option_menu' causes the `menu' to be detached * The destroy code of `option_menu' causes the `menu' to be detached
* from it and its reference count drops to zero. * from it and its reference count drops to zero.
* *
* The destroy code of `menu' destroyes `menu_item'. * The destroy code of `menu' destroys `menu_item'.
* *
* The destruction of `menu_item' removes it from its parent, the * The destruction of `menu_item' removes it from its parent, the
* menu_item->ref_count drops to zero and `menu_item' is finalized (freed). * menu_item->ref_count drops to zero and `menu_item' is finalized (freed).
@ -241,7 +241,7 @@ Taking care of proper referencing
There are some cases where referencing of widgets from outside the toolkit There are some cases where referencing of widgets from outside the toolkit
(on the application side) is needed. (on the application side) is needed.
Once the application performes an operation on a widget that will cause Once the application performs an operation on a widget that will cause
its reference count to drop, if it wants to take further actions on the its reference count to drop, if it wants to take further actions on the
widget, it needs to hold a reference to it. widget, it needs to hold a reference to it.

16
docs/styles.txt
View file

@ -26,11 +26,11 @@ gtk_widget_set_rc_style ()
This will override a previously set user style or rc style. This will override a previously set user style or rc style.
gtk_widget_reset_rc_styles () gtk_widget_reset_rc_styles ()
Descends through a widget heirarchy and sets the rc style Descends through a widget hierarchy and sets the rc style
on all widgets that don't have a user style set. on all widgets that don't have a user style set.
gtk_widget_restore_default_style () gtk_widget_restore_default_style ()
Reset the widget's style to the default style, this is only usefull if Reset the widget's style to the default style, this is only useful if
the widgets default style had been saved by previous calls to the widgets default style had been saved by previous calls to
gtk_widget_set_style() or gtk_widget_set_rc_style(). gtk_widget_set_style() or gtk_widget_set_rc_style().
@ -47,12 +47,12 @@ gtk_widget_set_name ()
gtk_widget_realize () gtk_widget_realize ()
Besides realizing the widget this function will: Besides realizing the widget this function will:
- perform an rc lookup if neccessary, - perform an rc lookup if necessary,
- attach a widget's style. - attach a widget's style.
gtk_widget_get_style () gtk_widget_get_style ()
Return a widgets style, this function will perform an rc lookup Return a widgets style, this function will perform an rc lookup
if neccessary. if necessary.
gtk_widget_set_parent () gtk_widget_set_parent ()
This function will perform rc lookups recursively for all widgets This function will perform rc lookups recursively for all widgets
@ -60,22 +60,22 @@ gtk_widget_set_parent ()
gtk_style_copy () gtk_style_copy ()
This function can be used to copy a widget's style. This function can be used to copy a widget's style.
The style can subsequntly be changed (e.g., by modifications to the The style can subsequently be changed (e.g., by modifications to the
red/green/blue values of a certain color) and then be applied to the red/green/blue values of a certain color) and then be applied to the
widget via gtk_widget_set_style(). widget via gtk_widget_set_style().
GtkWidget::style_set GtkWidget::style_set
This signal will be emitted for a widget once its style changes with This signal will be emitted for a widget once its style changes with
an additional argument previous_style wich will hold the widget->style an additional argument previous_style which will hold the widget->style
avlue from a previous emission. value from a previous emission.
The initial emission of this signal is guaranteed to happen prior The initial emission of this signal is guaranteed to happen prior
to any GtkWidget::size_request emission, and will have the previous_style to any GtkWidget::size_request emission, and will have the previous_style
argument set to NULL. argument set to NULL.
The GtkWidgetClass implements a default handler for this signal that The GtkWidgetClass implements a default handler for this signal that
will set the widget's window's background of widgets that provide their will set the widget's window's background of widgets that provide their
own windows according to the new style. own windows according to the new style.
Derived widgets need to overide this default handler, if: Derived widgets need to override this default handler, if:
- their size requisition depends on the current style. - their size requisition depends on the current style.
(e.g., on the style's fonts) (e.g., on the style's fonts)
- they set the background of widget->window to something other than. - they set the background of widget->window to something other than.

24
docs/text_widget.txt
View file

@ -18,7 +18,7 @@ complicated data structure exercise). I'm happy to answer questions.
High level description: High level description:
There are several layers of data structure to the widget. They are There are several layers of data structure to the widget. They are
seperated from each other as much as possible. The first is a gapped separated from each other as much as possible. The first is a gapped
text segment similar to the data structure Emacs uses for representing text segment similar to the data structure Emacs uses for representing
text. Then there is a property list, which stores text properties for text. Then there is a property list, which stores text properties for
various ranges of text. There is no direct relation between the text various ranges of text. There is no direct relation between the text
@ -93,7 +93,7 @@ transition. An important point is that all property marks are invalid
after a buffer modification unless care is taken to keep them after a buffer modification unless care is taken to keep them
accurate. That is the difficulty of the insert and delete operations, accurate. That is the difficulty of the insert and delete operations,
because as the next section describes, line data is cached and by because as the next section describes, line data is cached and by
neccesity contains text property marks. The functions for operating necessity contains text property marks. The functions for operating
and computing property marks are: and computing property marks are:
void advance_mark (GtkPropertyMark* mark); void advance_mark (GtkPropertyMark* mark);
@ -117,8 +117,8 @@ of the file for doing things like getting the current text property,
or some component of the current property. See the MARK_* macros. or some component of the current property. See the MARK_* macros.
Next there is a LineParams structure which contains all the Next there is a LineParams structure which contains all the
information neccesary to draw one line of text on screen. When I say information necessary to draw one line of text on screen. When I say
"line" here, I do not mean one line of text seperated by newlines, "line" here, I do not mean one line of text separated by newlines,
rather I mean one row of text on screen. It is a matter of policy how rather I mean one row of text on screen. It is a matter of policy how
visible lines are chosen and there are currently two policies, visible lines are chosen and there are currently two policies,
line-wrap and no-line-wrap. I suspect it would not be difficult to line-wrap and no-line-wrap. I suspect it would not be difficult to
@ -167,7 +167,7 @@ often, the last index is treated as a newline.
is, its properties are always that of the preceding character, is, its properties are always that of the preceding character,
if any. if any.
There is a fair bit of special case code to mantain this condition - There is a fair bit of special case code to maintain this condition -
which is needed so that user has control over the properties of which is needed so that user has control over the properties of
characters inserted at the last position. OWT 2/9/98 ] characters inserted at the last position. OWT 2/9/98 ]
@ -268,7 +268,7 @@ visible lines:
guint first_onscreen_ver_pixel; guint first_onscreen_ver_pixel;
LINE_START_CACHE is a doubly linked list of LineParams. CURRENT_LINE LINE_START_CACHE is a doubly linked list of LineParams. CURRENT_LINE
is a transient piece of data which is set in varoius places such as is a transient piece of data which is set in various places such as
the mouse click code. Generally, it is the line on which the cursor the mouse click code. Generally, it is the line on which the cursor
property mark CURSOR_MARK is on. LINE_START_CACHE points to the first property mark CURSOR_MARK is on. LINE_START_CACHE points to the first
visible line and may contain PREV pointers if the cached data of visible line and may contain PREV pointers if the cached data of
@ -331,7 +331,7 @@ The text properties list:
GList *text_properties_end; GList *text_properties_end;
A scratch area used for constructing a contiguous piece of the buffer A scratch area used for constructing a contiguous piece of the buffer
which may otherwise span the gap. It is not strictly neccesary which may otherwise span the gap. It is not strictly necessary
but simplifies the drawing code because it does not need to deal with but simplifies the drawing code because it does not need to deal with
the gap. the gap.
@ -408,7 +408,7 @@ copy area call. If the CURSOR argument to EXPOSE_TEXT is true, it
also draws the cursor. also draws the cursor.
The function DRAW_LINE draws a single line, doing all the tab and The function DRAW_LINE draws a single line, doing all the tab and
color computations neccesary. The function DRAW_LINE_WRAP draws the color computations necessary. The function DRAW_LINE_WRAP draws the
line wrap bitmap at the end of the line if it wraps. TEXT_EXPOSE will line wrap bitmap at the end of the line if it wraps. TEXT_EXPOSE will
expand the cached line data list if it has to by calling expand the cached line data list if it has to by calling
FETCH_LINES_FORWARD. The functions DRAW_CURSOR and UNDRAW_CURSOR draw FETCH_LINES_FORWARD. The functions DRAW_CURSOR and UNDRAW_CURSOR draw
@ -427,12 +427,12 @@ RECOMPUTE_GEOMETRY is called when the geometry of the window changes
or when it is first drawn. This is probably not done right. My or when it is first drawn. This is probably not done right. My
biggest weakness in writing this code is that I've never written a biggest weakness in writing this code is that I've never written a
widget before so I got most of the event handling stuff wrong as far widget before so I got most of the event handling stuff wrong as far
as Gtk is concerned. Fortunatly, most of the code is unrelated and as Gtk is concerned. Fortunately, most of the code is unrelated and
simply an exercise in data structure manipulation. simply an exercise in data structure manipulation.
Scrolling: Scrolling:
Scrolling is fairly straighforward. It looks at the top line, and Scrolling is fairly straightforward. It looks at the top line, and
advances it pixel by pixel until the FIRST_CUT_PIXELS equals the line advances it pixel by pixel until the FIRST_CUT_PIXELS equals the line
height and then advances the LINE_START_CACHE. When it runs out of height and then advances the LINE_START_CACHE. When it runs out of
lines it fetches more. The function SCROLL_INT is used to scroll from lines it fetches more. The function SCROLL_INT is used to scroll from
@ -454,7 +454,7 @@ character. It's fairly complicated. In order to do efficient pasting
into the buffer, or write code that modifies the buffer while the into the buffer, or write code that modifies the buffer while the
buffer is drawn, it needs to do multiple characters at at time. This buffer is drawn, it needs to do multiple characters at at time. This
is the hardest part of what remains. Currently, gtk_text_insert does is the hardest part of what remains. Currently, gtk_text_insert does
not reexpose the modified lines. It needs to. Pete did this wrong at not re-expose the modified lines. It needs to. Pete did this wrong at
one point and I disabled modification completely, I don't know what one point and I disabled modification completely, I don't know what
the current state of things are. The functions the current state of things are. The functions
INSERT_CHAR_LINE_EXPOSE and DELETE_CHAR_LINE_EXPOSE do the work. INSERT_CHAR_LINE_EXPOSE and DELETE_CHAR_LINE_EXPOSE do the work.
@ -477,7 +477,7 @@ Here's pseudo code for insert. Delete is quite similar.
What needs to be done: What needs to be done:
Horizintal scrolling, robustness, testing, selection handling. If you Horizontal scrolling, robustness, testing, selection handling. If you
want to work in the text widget pay attention to the debugging want to work in the text widget pay attention to the debugging
facilities I've written at the end of gtktext.c. I'm sorry I waited facilities I've written at the end of gtktext.c. I'm sorry I waited
so long to try and pass this off. I'm super busy with school and so long to try and pass this off. I'm super busy with school and

18
docs/widget_system.txt
View file

@ -45,7 +45,7 @@ GtkObject:
GTK_DESTROYED: GTK_DESTROYED:
This flagged is set for a GtkObject right before its This flagged is set for a GtkObject right before its
destruction code is executed. Its main use is the destruction code is executed. Its main use is the
prevention of multiple destruction invokations. prevention of multiple destruction invocations.
GTK_FLOATING: GTK_FLOATING:
This flag reflects the fact that the holder of the This flag reflects the fact that the holder of the
@ -94,7 +94,7 @@ GTK_CHILD_VISIBLE
and visible. Containers like GtkNotebook use this flag. and visible. Containers like GtkNotebook use this flag.
A private flag, not a public flag, so if you need to check A private flag, not a public flag, so if you need to check
this flag, you should call gtk_widget_get_child_visible(). this flag, you should call gtk_widget_get_child_visible().
(Should be very rarely necesary.) (Should be very rarely necessary.)
GTK_SENSITIVE: GTK_SENSITIVE:
Set and unset by gtk_widget_set_sensitive. Set and unset by gtk_widget_set_sensitive.
@ -155,7 +155,7 @@ GtkWidget, private flags:
GTK_USER_STYLE: GTK_USER_STYLE:
A widget is flagged to have a user style, once gtk_widget_set_style A widget is flagged to have a user style, once gtk_widget_set_style
has been invoked for it. The use of this flag is to tell widgets has been invoked for it. The use of this flag is to tell widgets
wich share a global user style from the ones which got a certain which share a global user style from the ones which got a certain
style assign from outside the toolkit. style assign from outside the toolkit.
GTK_RESIZE_PENDING: GTK_RESIZE_PENDING:
@ -163,7 +163,7 @@ GTK_RESIZE_PENDING:
[some of the code should move to gtkcontainer.c therefore] [some of the code should move to gtkcontainer.c therefore]
Relies on GTK_WIDGET_REALIZED(widget) Relies on GTK_WIDGET_REALIZED(widget)
[this is not really enforced throughout the code, but should [this is not really enforced throughout the code, but should
be. it only requires a few checks for GTK_WIDGET_RELIZED and be. it only requires a few checks for GTK_WIDGET_REALIZED and
minor changes to gtk_widget_unrealize, we can then remove the check minor changes to gtk_widget_unrealize, we can then remove the check
in gtk_widget_real_destroy] in gtk_widget_real_destroy]
Means: there is an idle handler waiting for the container to Means: there is an idle handler waiting for the container to
@ -176,7 +176,7 @@ GTK_RESIZE_NEEDED:
can be avoided] can be avoided]
Means: a widget has been added to the resize_widgets list of Means: a widget has been added to the resize_widgets list of
its _toplevel_ container (keep this in mind for GtkViewport). its _toplevel_ container (keep this in mind for GtkViewport).
Remark: this flag is also used internaly by gtkwindow.c during Remark: this flag is also used internally by gtkwindow.c during
the evaluation of resizing worthy widgets. the evaluation of resizing worthy widgets.
GTK_LEAVE_PENDING: GTK_LEAVE_PENDING:
@ -200,7 +200,7 @@ GTK_NEED_REQUEST:
requisition. If this flag is set, we must actually emit ::size-request requisition. If this flag is set, we must actually emit ::size-request
when gtk_widget_size_request() is called. Otherwise, we can when gtk_widget_size_request() is called. Otherwise, we can
simply widget->requisition. We keep track of this all the time simply widget->requisition. We keep track of this all the time
howevever, widgets with this flag set are only added to the resize however, widgets with this flag set are only added to the resize
queue if they are viewable. queue if they are viewable.
GTK_NEED_ALLOCATION: GTK_NEED_ALLOCATION:
@ -291,7 +291,7 @@ gtk_widget_destroy:
gtk_widget_realize: gtk_widget_realize:
if !GTK_DESTROYED sets GTK_REALIZED if !GTK_DESTROYED sets GTK_REALIZED
- Calling gtk_widget_realize when the widget is not a descendent - Calling gtk_widget_realize when the widget is not a descendant
of a toplevel is an ERROR. of a toplevel is an ERROR.
gtk_container_add (container, widget) [ and container-specific variants ] gtk_container_add (container, widget) [ and container-specific variants ]
@ -358,7 +358,7 @@ Widgets are created in an unrealized state.
The Realize signal The Realize signal
------------------ ------------------
When a widget recieves the "realize" signal it should: When a widget receives the "realize" signal it should:
NO_WINDOW widgets: (probably OK to use default handler) NO_WINDOW widgets: (probably OK to use default handler)
@ -454,7 +454,7 @@ When a widget receives the destroy signal, it must:
The "destroy" signal will only be received once. A widget The "destroy" signal will only be received once. A widget
will never receive any other signals after the destroy will never receive any other signals after the destroy
signal (but see the sectionalize on "Finalize" below) signal (but see the section on "Finalize" below)
The widget must handle calls to all publically accessible The widget must handle calls to all publically accessible
functions in an innocuous manner even after a "destroy" functions in an innocuous manner even after a "destroy"

2
gdk-pixbuf/gdk-pixbuf-csource.c
View file

@ -272,7 +272,7 @@ print_blurb (FILE *bout,
if (!print_help) if (!print_help)
{ {
g_fprintf (bout, "%s version ", PRG_NAME); g_fprintf (bout, "%s version ", PRG_NAME);
g_fprintf (bout, "%u.%u.%u", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); g_fprintf (bout, "%d.%d.%d", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
g_fprintf (bout, "\n"); g_fprintf (bout, "\n");
g_fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME); g_fprintf (bout, "%s comes with ABSOLUTELY NO WARRANTY.\n", PRG_NAME);
g_fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME); g_fprintf (bout, "You may redistribute copies of %s under the terms of\n", PRG_NAME);

4
gdk-pixbuf/gdk-pixdata.c
View file

@ -737,7 +737,7 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata,
cdata.static_prefix, cdata.const_prefix, name); cdata.static_prefix, cdata.const_prefix, name);
APPEND (gstring, " 0x%x, /* Pixbuf magic: 'GdkP' */\n", APPEND (gstring, " 0x%x, /* Pixbuf magic: 'GdkP' */\n",
GDK_PIXBUF_MAGIC_NUMBER); GDK_PIXBUF_MAGIC_NUMBER);
APPEND (gstring, " %u + %lu, /* header length + pixel_data length */\n", APPEND (gstring, " %d + %lu, /* header length + pixel_data length */\n",
GDK_PIXDATA_HEADER_LENGTH, GDK_PIXDATA_HEADER_LENGTH,
rle_encoded ? (glong)(img_buffer_end - img_buffer) : (glong)rowstride * height); rle_encoded ? (glong)(img_buffer_end - img_buffer) : (glong)rowstride * height);
APPEND (gstring, " 0x%x, /* pixdata_type */\n", APPEND (gstring, " 0x%x, /* pixdata_type */\n",
@ -779,7 +779,7 @@ gdk_pixdata_to_csource (GdkPixdata *pixdata,
cdata.pos = 3; cdata.pos = 3;
save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++);
save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++); save_uchar (&cdata, *img_buffer++);
APPEND (gstring, "\"\n /* length: header (%u) + pixel_data (%u) */\n \"", APPEND (gstring, "\"\n /* length: header (%d) + pixel_data (%u) */\n \"",
GDK_PIXDATA_HEADER_LENGTH, GDK_PIXDATA_HEADER_LENGTH,
rle_encoded ? pix_length : rowstride * height); rle_encoded ? pix_length : rowstride * height);
cdata.pos = 3; cdata.pos = 3;

2
gdk-pixbuf/queryloaders.c
View file

@ -127,7 +127,7 @@ write_loader_info (const char *path, GdkPixbufFormat *info)
char **ext; char **ext;
g_printf("\"%s\"\n", path); g_printf("\"%s\"\n", path);
g_printf ("\"%s\" %d \"%s\" \"%s\"\n", g_printf ("\"%s\" %u \"%s\" \"%s\"\n",
info->name, info->flags, info->name, info->flags,
info->domain ? info->domain : GETTEXT_PACKAGE, info->description); info->domain ? info->domain : GETTEXT_PACKAGE, info->description);
for (mime = info->mime_types; *mime; mime++) { for (mime = info->mime_types; *mime; mime++) {

5
gtk/gtkaboutdialog.c
View file

@ -178,11 +178,9 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkDialogClass *dialog_class;
object_class = (GObjectClass *)klass; object_class = (GObjectClass *)klass;
widget_class = (GtkWidgetClass *)klass; widget_class = (GtkWidgetClass *)klass;
dialog_class = (GtkDialogClass *)klass;
object_class->set_property = gtk_about_dialog_set_property; object_class->set_property = gtk_about_dialog_set_property;
object_class->get_property = gtk_about_dialog_get_property; object_class->get_property = gtk_about_dialog_get_property;
@ -1752,12 +1750,9 @@ set_cursor_if_appropriate (GtkAboutDialog *about,
{ {
GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data; GtkAboutDialogPrivate *priv = (GtkAboutDialogPrivate *)about->private_data;
GSList *tags = NULL, *tagp = NULL; GSList *tags = NULL, *tagp = NULL;
GtkTextBuffer *buffer;
GtkTextIter iter; GtkTextIter iter;
gboolean hovering_over_link = FALSE; gboolean hovering_over_link = FALSE;
buffer = gtk_text_view_get_buffer (text_view);
gtk_text_view_get_iter_at_location (text_view, &iter, x, y); gtk_text_view_get_iter_at_location (text_view, &iter, x, y);
tags = gtk_text_iter_get_tags (&iter); tags = gtk_text_iter_get_tags (&iter);

1
gtk/gtkaccelmap.c
View file

@ -37,7 +37,6 @@
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <io.h> #include <io.h>
#endif #endif
#include <errno.h>
/* --- structures --- */ /* --- structures --- */

6
gtk/gtkaction.c
View file

@ -774,10 +774,6 @@ connect_proxy (GtkAction *action,
} }
else else
{ {
GtkWidget *image;
image = gtk_button_get_image (GTK_BUTTON (proxy));
if (GTK_BIN (proxy)->child == NULL || if (GTK_BIN (proxy)->child == NULL ||
GTK_IS_LABEL (GTK_BIN (proxy)->child)) GTK_IS_LABEL (GTK_BIN (proxy)->child))
{ {
@ -1527,8 +1523,6 @@ gtk_action_set_icon_name (GtkAction *action,
else if (GTK_IS_BUTTON (proxy) && else if (GTK_IS_BUTTON (proxy) &&
!gtk_button_get_use_stock (GTK_BUTTON (proxy))) !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
{ {
GtkWidget *image;
image = gtk_button_get_image (GTK_BUTTON (proxy)); image = gtk_button_get_image (GTK_BUTTON (proxy));
if (GTK_IS_IMAGE (image) && if (GTK_IS_IMAGE (image) &&

12
gtk/gtkassistant.c
View file

@ -1780,14 +1780,12 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
GtkWidget *page, GtkWidget *page,
const gchar *title) const gchar *title)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_if_fail (GTK_IS_ASSISTANT (assistant)); g_return_if_fail (GTK_IS_ASSISTANT (assistant));
g_return_if_fail (GTK_IS_WIDGET (page)); g_return_if_fail (GTK_IS_WIDGET (page));
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_if_fail (child != NULL); g_return_if_fail (child != NULL);
@ -1814,14 +1812,12 @@ G_CONST_RETURN gchar*
gtk_assistant_get_page_title (GtkAssistant *assistant, gtk_assistant_get_page_title (GtkAssistant *assistant,
GtkWidget *page) GtkWidget *page)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL); g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (page), NULL); g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_val_if_fail (child != NULL, NULL); g_return_val_if_fail (child != NULL, NULL);
@ -1889,14 +1885,12 @@ GtkAssistantPageType
gtk_assistant_get_page_type (GtkAssistant *assistant, gtk_assistant_get_page_type (GtkAssistant *assistant,
GtkWidget *page) GtkWidget *page)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), GTK_ASSISTANT_PAGE_CONTENT); g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), GTK_ASSISTANT_PAGE_CONTENT);
g_return_val_if_fail (GTK_IS_WIDGET (page), GTK_ASSISTANT_PAGE_CONTENT); g_return_val_if_fail (GTK_IS_WIDGET (page), GTK_ASSISTANT_PAGE_CONTENT);
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_val_if_fail (child != NULL, GTK_ASSISTANT_PAGE_CONTENT); g_return_val_if_fail (child != NULL, GTK_ASSISTANT_PAGE_CONTENT);
@ -1971,14 +1965,12 @@ GdkPixbuf*
gtk_assistant_get_page_header_image (GtkAssistant *assistant, gtk_assistant_get_page_header_image (GtkAssistant *assistant,
GtkWidget *page) GtkWidget *page)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL); g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (page), NULL); g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_val_if_fail (child != NULL, NULL); g_return_val_if_fail (child != NULL, NULL);
@ -2053,14 +2045,12 @@ GdkPixbuf*
gtk_assistant_get_page_side_image (GtkAssistant *assistant, gtk_assistant_get_page_side_image (GtkAssistant *assistant,
GtkWidget *page) GtkWidget *page)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL); g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (page), NULL); g_return_val_if_fail (GTK_IS_WIDGET (page), NULL);
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_val_if_fail (child != NULL, NULL); g_return_val_if_fail (child != NULL, NULL);
@ -2128,14 +2118,12 @@ gboolean
gtk_assistant_get_page_complete (GtkAssistant *assistant, gtk_assistant_get_page_complete (GtkAssistant *assistant,
GtkWidget *page) GtkWidget *page)
{ {
GtkAssistantPrivate *priv;
GtkAssistantPage *page_info; GtkAssistantPage *page_info;
GList *child; GList *child;
g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), FALSE); g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (page), FALSE); g_return_val_if_fail (GTK_IS_WIDGET (page), FALSE);
priv = assistant->priv;
child = find_page (assistant, page); child = find_page (assistant, page);
g_return_val_if_fail (child != NULL, FALSE); g_return_val_if_fail (child != NULL, FALSE);

2
gtk/gtkbutton.c
View file

@ -1910,7 +1910,7 @@ gtk_button_screen_changed (GtkWidget *widget,
show_image_connection = show_image_connection =
g_signal_connect (settings, "notify::gtk-button-images", g_signal_connect (settings, "notify::gtk-button-images",
G_CALLBACK (gtk_button_setting_changed), 0); G_CALLBACK (gtk_button_setting_changed), NULL);
g_object_set_data (G_OBJECT (settings), g_object_set_data (G_OBJECT (settings),
I_("gtk-button-connection"), I_("gtk-button-connection"),
GUINT_TO_POINTER (show_image_connection)); GUINT_TO_POINTER (show_image_connection));

1
gtk/gtkcalendar.c
View file

@ -55,7 +55,6 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h" #include "gtkalias.h"

4
gtk/gtkcellrendereraccel.c
View file

@ -357,10 +357,8 @@ gtk_cell_renderer_accel_set_property (GObject *object,
if (changed) if (changed)
{ {
GtkCellRendererText *celltext;
gchar *text; gchar *text;
celltext = GTK_CELL_RENDERER_TEXT (accel);
text = convert_keysym_state_to_string (accel, accel->accel_key, accel->accel_mods, accel->keycode); text = convert_keysym_state_to_string (accel, accel->accel_key, accel->accel_mods, accel->keycode);
g_object_set (accel, "text", text, NULL); g_object_set (accel, "text", text, NULL);
g_free (text); g_free (text);
@ -519,7 +517,7 @@ typedef GtkEventBoxClass GtkCellEditableEventBoxClass;
G_DEFINE_TYPE_WITH_CODE (GtkCellEditableEventBox, _gtk_cell_editable_event_box, GTK_TYPE_EVENT_BOX, { \ G_DEFINE_TYPE_WITH_CODE (GtkCellEditableEventBox, _gtk_cell_editable_event_box, GTK_TYPE_EVENT_BOX, { \
G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_EDITABLE, _gtk_cell_editable_event_box_cell_editable_init) \ G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_EDITABLE, _gtk_cell_editable_event_box_cell_editable_init) \
}); })
static void static void

2
gtk/gtkcellrendererpixbuf.c
View file

@ -439,7 +439,7 @@ gtk_cell_renderer_pixbuf_create_named_icon_pixbuf (GtkCellRendererPixbuf *cellpi
priv->stock_size, priv->stock_size,
&width, &height)) &width, &height))
{ {
g_warning ("Invalid icon size %d\n", priv->stock_size); g_warning ("Invalid icon size %u\n", priv->stock_size);
width = height = 24; width = height = 24;
} }

1
gtk/gtkcolorsel.c
View file

@ -55,7 +55,6 @@
#include "gtkmenuitem.h" #include "gtkmenuitem.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkimage.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkprivate.h" #include "gtkprivate.h"

4
gtk/gtkcombo.c
View file

@ -50,7 +50,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h" #include "gtkalias.h"
const gchar gtk_combo_string_key[] = "gtk-combo-string-value"; static const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
#define COMBO_LIST_MAX_HEIGHT (400) #define COMBO_LIST_MAX_HEIGHT (400)
#define EMPTY_LIST_HEIGHT (15) #define EMPTY_LIST_HEIGHT (15)
@ -561,7 +561,7 @@ gtk_combo_popup_list (GtkCombo *combo)
{ {
gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (combo->popwin)); GTK_WINDOW (combo->popwin));
gtk_window_set_transient_for (combo->popwin, GTK_WINDOW (toplevel)); gtk_window_set_transient_for (GTK_WINDOW (combo->popwin), GTK_WINDOW (toplevel));
} }
gtk_widget_set_size_request (combo->popwin, width, height); gtk_widget_set_size_request (combo->popwin, width, height);

1
gtk/gtkcombobox.c
View file

@ -3671,7 +3671,6 @@ gtk_combo_box_list_key_press (GtkWidget *widget,
if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter || if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
event->keyval == GDK_space || event->keyval == GDK_KP_Space) event->keyval == GDK_space || event->keyval == GDK_KP_Space)
{ {
GtkTreeIter iter;
GtkTreeModel *model = NULL; GtkTreeModel *model = NULL;
gtk_combo_box_popdown (combo_box); gtk_combo_box_popdown (combo_box);

13
gtk/gtkctree.c
View file

@ -1618,7 +1618,6 @@ draw_row (GtkCList *clist,
{ {
GtkWidget *widget; GtkWidget *widget;
GtkCTree *ctree; GtkCTree *ctree;
GdkRectangle *rect;
GdkRectangle *crect; GdkRectangle *crect;
GdkRectangle row_rectangle; GdkRectangle row_rectangle;
GdkRectangle cell_rectangle; GdkRectangle cell_rectangle;
@ -1680,7 +1679,6 @@ draw_row (GtkCList *clist,
/* draw the cell borders */ /* draw the cell borders */
if (area) if (area)
{ {
rect = &intersect_rectangle;
crect = &intersect_rectangle; crect = &intersect_rectangle;
if (gdk_rectangle_intersect (area, &cell_rectangle, crect)) if (gdk_rectangle_intersect (area, &cell_rectangle, crect))
@ -1690,7 +1688,6 @@ draw_row (GtkCList *clist,
} }
else else
{ {
rect = &clip_rectangle;
crect = &cell_rectangle; crect = &cell_rectangle;
gdk_draw_rectangle (clist->clist_window, gdk_draw_rectangle (clist->clist_window,
@ -2515,7 +2512,6 @@ real_tree_expand (GtkCTree *ctree,
GtkCTreeNode *work; GtkCTreeNode *work;
GtkRequisition requisition; GtkRequisition requisition;
gboolean visible; gboolean visible;
gint level;
g_return_if_fail (GTK_IS_CTREE (ctree)); g_return_if_fail (GTK_IS_CTREE (ctree));
@ -2527,7 +2523,6 @@ real_tree_expand (GtkCTree *ctree,
GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL); GTK_CLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
GTK_CTREE_ROW (node)->expanded = TRUE; GTK_CTREE_ROW (node)->expanded = TRUE;
level = GTK_CTREE_ROW (node)->level;
visible = gtk_ctree_is_viewable (ctree, node); visible = gtk_ctree_is_viewable (ctree, node);
/* get cell width if tree_column is auto resized */ /* get cell width if tree_column is auto resized */
@ -3513,7 +3508,6 @@ ctree_is_hot_spot (GtkCTree *ctree,
{ {
GtkCTreeRow *tree_row; GtkCTreeRow *tree_row;
GtkCList *clist; GtkCList *clist;
GtkCellPixText *cell;
gint xl; gint xl;
gint yu; gint yu;
@ -3528,8 +3522,6 @@ ctree_is_hot_spot (GtkCTree *ctree,
tree_row = GTK_CTREE_ROW (node); tree_row = GTK_CTREE_ROW (node);
cell = GTK_CELL_PIXTEXT (tree_row->row.cell[ctree->tree_column]);
yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - PM_SIZE) / 2 - yu = (ROW_TOP_YPIXEL (clist, row) + (clist->row_height - PM_SIZE) / 2 -
(clist->row_height - 1) % 2); (clist->row_height - 1) % 2);
@ -3852,9 +3844,6 @@ gtk_ctree_remove_node (GtkCTree *ctree,
if (node) if (node)
{ {
gboolean visible;
visible = gtk_ctree_is_viewable (ctree, node);
gtk_ctree_unlink (ctree, node, TRUE); gtk_ctree_unlink (ctree, node, TRUE);
gtk_ctree_post_recursive (ctree, node, GTK_CTREE_FUNC (tree_delete), gtk_ctree_post_recursive (ctree, node, GTK_CTREE_FUNC (tree_delete),
NULL); NULL);
@ -4103,7 +4092,7 @@ gtk_ctree_node_nth (GtkCTree *ctree,
{ {
g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL); g_return_val_if_fail (GTK_IS_CTREE (ctree), NULL);
if ((row < 0) || (row >= GTK_CLIST(ctree)->rows)) if ((row >= GTK_CLIST(ctree)->rows))
return NULL; return NULL;
return GTK_CTREE_NODE (g_list_nth (GTK_CLIST (ctree)->row_list, row)); return GTK_CTREE_NODE (g_list_nth (GTK_CLIST (ctree)->row_list, row));

3
gtk/gtkcurve.c
View file

@ -794,7 +794,7 @@ gtk_curve_reset (GtkCurve *c)
void void
gtk_curve_set_gamma (GtkCurve *c, gfloat gamma) gtk_curve_set_gamma (GtkCurve *c, gfloat gamma)
{ {
gfloat x, one_over_gamma, height, one_over_width; gfloat x, one_over_gamma, height;
GtkCurveType old_type; GtkCurveType old_type;
gint i; gint i;
@ -808,7 +808,6 @@ gtk_curve_set_gamma (GtkCurve *c, gfloat gamma)
one_over_gamma = 1.0; one_over_gamma = 1.0;
else else
one_over_gamma = 1.0 / gamma; one_over_gamma = 1.0 / gamma;
one_over_width = 1.0 / (c->num_points - 1);
height = c->height; height = c->height;
for (i = 0; i < c->num_points; ++i) for (i = 0; i < c->num_points; ++i)
{ {

2
gtk/gtkdnd.c
View file

@ -3109,7 +3109,7 @@ gtk_drag_set_icon_pixmap (GdkDragContext *context,
gtk_widget_push_colormap (colormap); gtk_widget_push_colormap (colormap);
window = gtk_window_new (GTK_WINDOW_POPUP); window = gtk_window_new (GTK_WINDOW_POPUP);
gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DND); gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
gtk_window_set_screen (GTK_WINDOW (window), screen); gtk_window_set_screen (GTK_WINDOW (window), screen);
set_can_change_screen (window, FALSE); set_can_change_screen (window, FALSE);
gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);

2
gtk/gtkentrycompletion.c
View file

@ -832,7 +832,7 @@ gtk_entry_completion_action_button_press (GtkWidget *widget,
if (!GTK_WIDGET_MAPPED (completion->priv->popup_window)) if (!GTK_WIDGET_MAPPED (completion->priv->popup_window))
return FALSE; return FALSE;
_gtk_entry_reset_im_context (completion->priv->entry); _gtk_entry_reset_im_context (GTK_ENTRY (completion->priv->entry));
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
event->x, event->y, event->x, event->y,

8
gtk/gtkfilechooserbutton.c
View file

@ -219,7 +219,7 @@ static void gtk_file_chooser_button_drag_data_received (GtkWidget *wi
gint x, gint x,
gint y, gint y,
GtkSelectionData *data, GtkSelectionData *data,
guint info, guint type,
guint drag_time); guint drag_time);
static void gtk_file_chooser_button_show_all (GtkWidget *widget); static void gtk_file_chooser_button_show_all (GtkWidget *widget);
static void gtk_file_chooser_button_hide_all (GtkWidget *widget); static void gtk_file_chooser_button_hide_all (GtkWidget *widget);
@ -1033,7 +1033,7 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
gint x, gint x,
gint y, gint y,
GtkSelectionData *data, GtkSelectionData *data,
guint info, guint type,
guint drag_time) guint drag_time)
{ {
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget); GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
@ -1045,13 +1045,13 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
(*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget, (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget,
context, context,
x, y, x, y,
data, info, data, type,
drag_time); drag_time);
if (widget == NULL || context == NULL || data == NULL || data->length < 0) if (widget == NULL || context == NULL || data == NULL || data->length < 0)
return; return;
switch (info) switch (type)
{ {
case TEXT_URI_LIST: case TEXT_URI_LIST:
{ {

1
gtk/gtkfilechooserdefault.c
View file

@ -26,7 +26,6 @@
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkcellrenderertext.h"
#include "gtkcheckmenuitem.h" #include "gtkcheckmenuitem.h"
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkcombobox.h" #include "gtkcombobox.h"

2
gtk/gtkfilechooserentry.c
View file

@ -646,8 +646,6 @@ out:
static gboolean static gboolean
load_directory_callback (GtkFileChooserEntry *chooser_entry) load_directory_callback (GtkFileChooserEntry *chooser_entry)
{ {
GSList *child_paths = NULL;
GDK_THREADS_ENTER (); GDK_THREADS_ENTER ();
chooser_entry->load_directory_idle = 0; chooser_entry->load_directory_idle = 0;

2
gtk/gtkfilechoosersettings.c
View file

@ -346,7 +346,7 @@ parse_config (GtkFileChooserSettings *settings,
const char *contents, const char *contents,
GError **error) GError **error)
{ {
GMarkupParser parser = { 0, }; GMarkupParser parser = { NULL, };
GMarkupParseContext *context; GMarkupParseContext *context;
struct parse_state state; struct parse_state state;
gboolean retval; gboolean retval;

8
gtk/gtkfilesystemunix.c
View file

@ -833,8 +833,8 @@ gtk_file_system_unix_get_info (GtkFileSystem *file_system,
handle = create_handle (file_system); handle = create_handle (file_system);
filename = gtk_file_path_get_string (path); filename = gtk_file_path_get_string (path);
g_return_val_if_fail (filename != NULL, FALSE); g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (g_path_is_absolute (filename), FALSE); g_return_val_if_fail (g_path_is_absolute (filename), NULL);
if (!stat_with_error (filename, &statbuf, &error)) if (!stat_with_error (filename, &statbuf, &error))
{ {
@ -1042,8 +1042,8 @@ gtk_file_system_unix_create_folder (GtkFileSystem *file_syst
system_unix = GTK_FILE_SYSTEM_UNIX (file_system); system_unix = GTK_FILE_SYSTEM_UNIX (file_system);
filename = gtk_file_path_get_string (path); filename = gtk_file_path_get_string (path);
g_return_val_if_fail (filename != NULL, FALSE); g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (g_path_is_absolute (filename), FALSE); g_return_val_if_fail (g_path_is_absolute (filename), NULL);
handle = create_handle (file_system); handle = create_handle (file_system);

2
gtk/gtkhandlebox.c
View file

@ -540,7 +540,7 @@ gtk_handle_box_size_request (GtkWidget *widget,
} }
/* if our child is not visible, we still request its size, since we /* if our child is not visible, we still request its size, since we
* won't have any usefull hint for our size otherwise. * won't have any useful hint for our size otherwise.
*/ */
if (bin->child) if (bin->child)
gtk_widget_size_request (bin->child, &child_requisition); gtk_widget_size_request (bin->child, &child_requisition);

2
gtk/gtkiconcache.c
View file

@ -433,7 +433,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
if (type != 0) if (type != 0)
{ {
GTK_NOTE (ICONTHEME, GTK_NOTE (ICONTHEME,
g_print ("invalid pixel data type %d\n", type)); g_print ("invalid pixel data type %u\n", type));
return NULL; return NULL;
} }

4
gtk/gtkiconfactory.c
View file

@ -1020,7 +1020,7 @@ gtk_icon_size_register_alias (const gchar *alias,
init_icon_sizes (); init_icon_sizes ();
if (!icon_size_lookup_intern (NULL, target, NULL, NULL)) if (!icon_size_lookup_intern (NULL, target, NULL, NULL))
g_warning ("gtk_icon_size_register_alias: Icon size %d does not exist", target); g_warning ("gtk_icon_size_register_alias: Icon size %u does not exist", target);
ia = g_hash_table_lookup (icon_aliases, alias); ia = g_hash_table_lookup (icon_aliases, alias);
if (ia) if (ia)
@ -1453,7 +1453,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source,
} }
else else
{ {
g_warning ("Invalid icon size %d\n", size); g_warning ("Invalid icon size %u\n", size);
width = height = 24; width = height = 24;
} }
} }

4
gtk/gtkicontheme.c
View file

@ -875,7 +875,7 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name)
char **dirs; char **dirs;
char **themes; char **themes;
GtkIconThemePrivate *priv; GtkIconThemePrivate *priv;
IconTheme *theme; IconTheme *theme = NULL;
char *path; char *path;
GKeyFile *theme_file; GKeyFile *theme_file;
GError *error = NULL; GError *error = NULL;
@ -1855,7 +1855,7 @@ theme_dir_get_icon_suffix (IconThemeDir *dir,
suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name)); suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name));
GTK_NOTE (ICONTHEME, GTK_NOTE (ICONTHEME,
g_print ("get_icon_suffix%s %d\n", dir->cache ? " (cached)" : "", suffix)); g_print ("get_icon_suffix%s %u\n", dir->cache ? " (cached)" : "", suffix));
return suffix; return suffix;
} }

3
gtk/gtkiconview.c
View file

@ -8539,7 +8539,6 @@ gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
{ {
GtkIconViewAccessiblePrivate *priv; GtkIconViewAccessiblePrivate *priv;
GtkIconViewItemAccessibleInfo *info; GtkIconViewItemAccessibleInfo *info;
GtkIconViewAccessible *view;
GtkIconView *icon_view; GtkIconView *icon_view;
GtkIconViewItemAccessible *item; GtkIconViewItemAccessible *item;
GList *items; GList *items;
@ -8547,7 +8546,6 @@ gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data)); atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
icon_view = GTK_ICON_VIEW (user_data); icon_view = GTK_ICON_VIEW (user_data);
view = GTK_ICON_VIEW_ACCESSIBLE (atk_obj);
priv = gtk_icon_view_accessible_get_priv (atk_obj); priv = gtk_icon_view_accessible_get_priv (atk_obj);
items = priv->items; items = priv->items;
@ -8923,7 +8921,6 @@ gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
GtkWidget *widget; GtkWidget *widget;
GtkIconView *icon_view; GtkIconView *icon_view;
GtkIconViewItem *item; GtkIconViewItem *item;
GList *l;
widget = GTK_ACCESSIBLE (selection)->widget; widget = GTK_ACCESSIBLE (selection)->widget;
if (widget == NULL) if (widget == NULL)

2
gtk/gtkimagemenuitem.c
View file

@ -616,7 +616,7 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget,
show_image_connection = show_image_connection =
g_signal_connect (settings, "notify::gtk-menu-images", g_signal_connect (settings, "notify::gtk-menu-images",
G_CALLBACK (gtk_image_menu_item_setting_changed), 0); G_CALLBACK (gtk_image_menu_item_setting_changed), NULL);
g_object_set_data (G_OBJECT (settings), g_object_set_data (G_OBJECT (settings),
I_("gtk-image-menu-item-connection"), I_("gtk-image-menu-item-connection"),
GUINT_TO_POINTER (show_image_connection)); GUINT_TO_POINTER (show_image_connection));

4
gtk/gtkinputdialog.c
View file

@ -481,8 +481,10 @@ gtk_input_dialog_set_axis (GtkWidget *w,
else else
old_use = GDK_AXIS_IGNORE; old_use = GDK_AXIS_IGNORE;
if (axis == old_axis) if (axis == old_axis) {
g_free (new_axes);
return; return;
}
/* we must always have an x and a y axis */ /* we must always have an x and a y axis */
if ((axis == -1 && (use == GDK_AXIS_X || use == GDK_AXIS_Y)) || if ((axis == -1 && (use == GDK_AXIS_X || use == GDK_AXIS_Y)) ||

1
gtk/gtkmenu.c
View file

@ -3956,7 +3956,6 @@ gtk_menu_stop_scrolling (GtkMenu *menu)
{ {
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (menu)); GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (menu));
gboolean touchscreen_mode; gboolean touchscreen_mode;
gboolean was_scrolling;
gtk_menu_remove_scroll_timeout (menu); gtk_menu_remove_scroll_timeout (menu);

2
gtk/gtkmessagedialog.c
View file

@ -333,7 +333,7 @@ setup_type (GtkMessageDialog *dialog,
break; break;
default: default:
g_warning ("Unknown GtkMessageType %d", type); g_warning ("Unknown GtkMessageType %u", type);
break; break;
} }

6
gtk/gtknotebook.c
View file

@ -179,9 +179,9 @@ struct _GtkNotebookPrivate
guint32 timestamp; guint32 timestamp;
gboolean during_reorder : 1; guint during_reorder : 1;
gboolean during_detach : 1; guint during_detach : 1;
gboolean has_scrolled : 1; guint has_scrolled : 1;
}; };
static const GtkTargetEntry notebook_source_targets [] = { static const GtkTargetEntry notebook_source_targets [] = {

1
gtk/gtkpathbar.c
View file

@ -250,7 +250,6 @@ remove_settings_signal (GtkPathBar *path_bar,
static void static void
gtk_path_bar_dispose (GObject *object) gtk_path_bar_dispose (GObject *object)
{ {
GList *list;
GtkPathBar *path_bar = GTK_PATH_BAR (object); GtkPathBar *path_bar = GTK_PATH_BAR (object);
remove_settings_signal (path_bar, gtk_widget_get_screen (GTK_WIDGET (object))); remove_settings_signal (path_bar, gtk_widget_get_screen (GTK_WIDGET (object)));

2
gtk/gtkprinteroptionwidget.c
View file

@ -358,11 +358,9 @@ combo_box_set (GtkWidget *combo,
const gchar *value) const gchar *value)
{ {
GtkTreeModel *model; GtkTreeModel *model;
GtkListStore *store;
struct ComboSet set_data; struct ComboSet set_data;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
store = GTK_LIST_STORE (model);
set_data.combo = GTK_COMBO_BOX (combo); set_data.combo = GTK_COMBO_BOX (combo);
set_data.value = value; set_data.value = value;

1
gtk/gtkrange.c
View file

@ -33,7 +33,6 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkrange.h" #include "gtkrange.h"
#include "gtkintl.h"
#include "gtkscrollbar.h" #include "gtkscrollbar.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkalias.h" #include "gtkalias.h"

2
gtk/gtkrbtree.c
View file

@ -1567,7 +1567,7 @@ count_parity (GtkRBTree *tree,
g_print ("parity incorrect for node\n"); g_print ("parity incorrect for node\n");
if (get_parity (node) != 1) if (get_parity (node) != 1)
g_error ("Node has incorrect parity %d", get_parity (node)); g_error ("Node has incorrect parity %u", get_parity (node));
return res; return res;
} }

1
gtk/gtkrecentchooserdefault.c
View file

@ -60,7 +60,6 @@
#include "gtkseparatormenuitem.h" #include "gtkseparatormenuitem.h"
#include "gtksizegroup.h" #include "gtksizegroup.h"
#include "gtktable.h" #include "gtktable.h"
#include "gtktreeview.h"
#include "gtktreemodelsort.h" #include "gtktreemodelsort.h"
#include "gtktreemodelfilter.h" #include "gtktreemodelfilter.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"

8
gtk/gtkrecentchoosermenu.c
View file

@ -45,13 +45,6 @@
#include "gtkobject.h" #include "gtkobject.h"
#include "gtktooltips.h" #include "gtktooltips.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkrecentmanager.h"
#include "gtkrecentfilter.h"
#include "gtkrecentchooser.h"
#include "gtkrecentchooserutils.h"
#include "gtkrecentchooserprivate.h"
#include "gtkrecentchoosermenu.h"
#include "gtkalias.h" #include "gtkalias.h"
struct _GtkRecentChooserMenuPrivate struct _GtkRecentChooserMenuPrivate
@ -915,7 +908,6 @@ gtk_recent_chooser_menu_create_item (GtkRecentChooserMenu *menu,
G_CALLBACK (item_activate_cb), G_CALLBACK (item_activate_cb),
menu); menu);
out:
g_free (label); g_free (label);
return item; return item;

4
gtk/gtkscrolledwindow.c
View file

@ -928,7 +928,7 @@ gtk_scrolled_window_screen_changed (GtkWidget *widget,
window_placement_connection = window_placement_connection =
g_signal_connect (settings, "notify::gtk-scrolled-window-placement", g_signal_connect (settings, "notify::gtk-scrolled-window-placement",
G_CALLBACK (gtk_scrolled_window_settings_changed), 0); G_CALLBACK (gtk_scrolled_window_settings_changed), NULL);
g_object_set_data (G_OBJECT (settings), g_object_set_data (G_OBJECT (settings),
I_("gtk-scrolled-window-connection"), I_("gtk-scrolled-window-connection"),
GUINT_TO_POINTER (window_placement_connection)); GUINT_TO_POINTER (window_placement_connection));
@ -1049,7 +1049,7 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window,
case GTK_SCROLL_END: case GTK_SCROLL_END:
break; break;
default: default:
g_warning ("Invalid scroll type %d for GtkSpinButton::change-value", scroll); g_warning ("Invalid scroll type %u for GtkSpinButton::change-value", scroll);
return; return;
} }

1
gtk/gtkselection.c
View file

@ -1620,7 +1620,6 @@ gtk_selection_data_get_uris (GtkSelectionData *selection_data)
selection_data->type == text_uri_list_atom) selection_data->type == text_uri_list_atom)
{ {
gchar **list; gchar **list;
gint i;
gint count = gdk_text_property_to_utf8_list_for_display (selection_data->display, gint count = gdk_text_property_to_utf8_list_for_display (selection_data->display,
utf8_atom, utf8_atom,
selection_data->format, selection_data->format,

11
gtk/gtkstatusbar.c
View file

@ -259,12 +259,10 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
const gchar *text) const gchar *text)
{ {
GtkStatusbarMsg *msg; GtkStatusbarMsg *msg;
GtkStatusbarClass *class;
g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0); g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
g_return_val_if_fail (text != NULL, 0); g_return_val_if_fail (text != NULL, 0);
class = GTK_STATUSBAR_GET_CLASS (statusbar);
msg = g_slice_new (GtkStatusbarMsg); msg = g_slice_new (GtkStatusbarMsg);
msg->text = g_strdup (text); msg->text = g_strdup (text);
msg->context_id = context_id; msg->context_id = context_id;
@ -299,10 +297,6 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
if (msg->context_id == context_id) if (msg->context_id == context_id)
{ {
GtkStatusbarClass *class;
class = GTK_STATUSBAR_GET_CLASS (statusbar);
statusbar->messages = g_slist_remove_link (statusbar->messages, statusbar->messages = g_slist_remove_link (statusbar->messages,
list); list);
g_free (msg->text); g_free (msg->text);
@ -352,9 +346,6 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
if (msg->context_id == context_id && if (msg->context_id == context_id &&
msg->message_id == message_id) msg->message_id == message_id)
{ {
GtkStatusbarClass *class;
class = GTK_STATUSBAR_GET_CLASS (statusbar);
statusbar->messages = g_slist_remove_link (statusbar->messages, list); statusbar->messages = g_slist_remove_link (statusbar->messages, list);
g_free (msg->text); g_free (msg->text);
g_slice_free (GtkStatusbarMsg, msg); g_slice_free (GtkStatusbarMsg, msg);
@ -408,13 +399,11 @@ static void
gtk_statusbar_destroy (GtkObject *object) gtk_statusbar_destroy (GtkObject *object)
{ {
GtkStatusbar *statusbar; GtkStatusbar *statusbar;
GtkStatusbarClass *class;
GSList *list; GSList *list;
g_return_if_fail (GTK_IS_STATUSBAR (object)); g_return_if_fail (GTK_IS_STATUSBAR (object));
statusbar = GTK_STATUSBAR (object); statusbar = GTK_STATUSBAR (object);
class = GTK_STATUSBAR_GET_CLASS (statusbar);
for (list = statusbar->messages; list; list = list->next) for (list = statusbar->messages; list; list = list->next)
{ {

2
gtk/gtkstatusicon.c
View file

@ -1044,7 +1044,7 @@ gtk_status_icon_set_image (GtkStatusIcon *status_icon,
g_object_notify (G_OBJECT (status_icon), "icon-name"); g_object_notify (G_OBJECT (status_icon), "icon-name");
break; break;
default: default:
g_warning ("Image type %d not handled by GtkStatusIcon", storage_type); g_warning ("Image type %u not handled by GtkStatusIcon", storage_type);
} }
g_object_thaw_notify (G_OBJECT (status_icon)); g_object_thaw_notify (G_OBJECT (status_icon));

7
gtk/gtktextbuffer.c
View file

@ -563,7 +563,6 @@ static void
gtk_text_buffer_finalize (GObject *object) gtk_text_buffer_finalize (GObject *object)
{ {
GtkTextBuffer *buffer; GtkTextBuffer *buffer;
GtkTextBufferPrivate *priv;
buffer = GTK_TEXT_BUFFER (object); buffer = GTK_TEXT_BUFFER (object);
@ -3237,9 +3236,6 @@ clipboard_rich_text_received (GtkClipboard *clipboard,
GtkTextIter insert_point; GtkTextIter insert_point;
gboolean retval = TRUE; gboolean retval = TRUE;
GError *error = NULL; GError *error = NULL;
GtkTextBufferPrivate *priv;
priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
if (text != NULL && length > 0) if (text != NULL && length > 0)
{ {
@ -3328,7 +3324,6 @@ clipboard_clipboard_buffer_received (GtkClipboard *clipboard,
{ {
ClipboardRequest *request_data = data; ClipboardRequest *request_data = data;
GtkTextBuffer *src_buffer; GtkTextBuffer *src_buffer;
GtkTextBufferPrivate *priv;
src_buffer = selection_data_get_buffer (selection_data, request_data); src_buffer = selection_data_get_buffer (selection_data, request_data);
@ -3352,8 +3347,6 @@ clipboard_clipboard_buffer_received (GtkClipboard *clipboard,
} }
else else
{ {
priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
if (gtk_clipboard_wait_is_rich_text_available (clipboard, if (gtk_clipboard_wait_is_rich_text_available (clipboard,
request_data->buffer)) request_data->buffer))
{ {

37
gtk/gtktextiter.c
View file

@ -299,24 +299,12 @@ iter_init_from_char_offset (GtkTextIter *iter,
return real; return real;
} }
static inline void
invalidate_segment (GtkTextRealIter *iter)
{
iter->segments_changed_stamp -= 1;
}
static inline void static inline void
invalidate_char_index (GtkTextRealIter *iter) invalidate_char_index (GtkTextRealIter *iter)
{ {
iter->cached_char_index = -1; iter->cached_char_index = -1;
} }
static inline void
invalidate_line_number (GtkTextRealIter *iter)
{
iter->cached_line_number = -1;
}
static inline void static inline void
adjust_char_index (GtkTextRealIter *iter, gint count) adjust_char_index (GtkTextRealIter *iter, gint count)
{ {
@ -331,28 +319,6 @@ adjust_line_number (GtkTextRealIter *iter, gint count)
iter->cached_line_number += count; iter->cached_line_number += count;
} }
static inline void
adjust_char_offsets (GtkTextRealIter *iter, gint count)
{
if (iter->line_char_offset >= 0)
{
iter->line_char_offset += count;
g_assert (iter->segment_char_offset >= 0);
iter->segment_char_offset += count;
}
}
static inline void
adjust_byte_offsets (GtkTextRealIter *iter, gint count)
{
if (iter->line_byte_offset >= 0)
{
iter->line_byte_offset += count;
g_assert (iter->segment_byte_offset >= 0);
iter->segment_byte_offset += count;
}
}
static inline void static inline void
ensure_char_offsets (GtkTextRealIter *iter) ensure_char_offsets (GtkTextRealIter *iter)
{ {
@ -3917,7 +3883,6 @@ gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
gint byte_on_line) gint byte_on_line)
{ {
GtkTextRealIter *real; GtkTextRealIter *real;
gint bytes_in_line = 0;
gint offset = 0; gint offset = 0;
GtkTextIter pos; GtkTextIter pos;
GtkTextLineSegment *seg; GtkTextLineSegment *seg;
@ -3926,8 +3891,6 @@ gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
gtk_text_iter_set_line_offset (iter, 0); gtk_text_iter_set_line_offset (iter, 0);
bytes_in_line = gtk_text_iter_get_bytes_in_line (iter);
pos = *iter; pos = *iter;
real = gtk_text_iter_make_real (&pos); real = gtk_text_iter_make_real (&pos);

61
gtk/gtktextsegment.c
View file

@ -298,6 +298,11 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
* This procedure merges adjacent character segments into * This procedure merges adjacent character segments into
* a single character segment, if possible. * a single character segment, if possible.
* *
* Arguments:
* segPtr: Pointer to the first of two adjacent segments to
* join.
* line: Line containing segments (not used).
*
* Results: * Results:
* The return value is a pointer to the first segment in * The return value is a pointer to the first segment in
* the (new) list of segments that used to start with segPtr. * the (new) list of segments that used to start with segPtr.
@ -310,11 +315,7 @@ char_segment_split_func (GtkTextLineSegment *seg, int index)
/* ARGSUSED */ /* ARGSUSED */
static GtkTextLineSegment * static GtkTextLineSegment *
char_segment_cleanup_func (segPtr, line) char_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
GtkTextLineSegment *segPtr; /* Pointer to first of two adjacent
* segments to join. */
GtkTextLine *line; /* Line containing segments (not
* used). */
{ {
GtkTextLineSegment *segPtr2, *newPtr; GtkTextLineSegment *segPtr2, *newPtr;
@ -352,6 +353,12 @@ char_segment_cleanup_func (segPtr, line)
* *
* This procedure is invoked to delete a character segment. * This procedure is invoked to delete a character segment.
* *
* Arguments:
* segPtr : Segment to delete
* line : Line containing segment
* treeGone : Non-zero means the entire tree is being
* deleted, so everything must get cleaned up.
*
* Results: * Results:
* Always returns 0 to indicate that the segment was deleted. * Always returns 0 to indicate that the segment was deleted.
* *
@ -363,12 +370,7 @@ char_segment_cleanup_func (segPtr, line)
/* ARGSUSED */ /* ARGSUSED */
static int static int
char_segment_delete_func (segPtr, line, treeGone) char_segment_delete_func (GtkTextLineSegment *segPtr, GtkTextLine *line, int treeGone)
GtkTextLineSegment *segPtr; /* Segment to delete. */
GtkTextLine *line; /* Line containing segment. */
int treeGone; /* Non-zero means the entire tree is
* being deleted, so everything must
* get cleaned up. */
{ {
g_free ((char*) segPtr); g_free ((char*) segPtr);
return 0; return 0;
@ -382,6 +384,10 @@ char_segment_delete_func (segPtr, line, treeGone)
* This procedure is invoked to perform consistency checks * This procedure is invoked to perform consistency checks
* on character segments. * on character segments.
* *
* Arguments:
* segPtr : Segment to check
* line : Line containing segment
*
* Results: * Results:
* None. * None.
* *
@ -394,9 +400,7 @@ char_segment_delete_func (segPtr, line, treeGone)
/* ARGSUSED */ /* ARGSUSED */
static void static void
char_segment_check_func (segPtr, line) char_segment_check_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line containing segment. */
{ {
char_segment_self_check (segPtr); char_segment_self_check (segPtr);
@ -436,6 +440,12 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
* *
* This procedure is invoked to delete toggle segments. * This procedure is invoked to delete toggle segments.
* *
* Arguments:
* segPtr : Segment to check
* line : Line containing segment
* treeGone : Non-zero means the entire tree is being
* deleted so everything must get cleaned up
*
* Results: * Results:
* Returns 1 to indicate that the segment may not be deleted, * Returns 1 to indicate that the segment may not be deleted,
* unless the entire B-tree is going away. * unless the entire B-tree is going away.
@ -449,12 +459,7 @@ _gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
*/ */
static int static int
toggle_segment_delete_func (segPtr, line, treeGone) toggle_segment_delete_func (GtkTextLineSegment *segPtr, GtkTextLine *line, int treeGone)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line containing segment. */
int treeGone; /* Non-zero means the entire tree is
* being deleted, so everything must
* get cleaned up. */
{ {
if (treeGone) if (treeGone)
{ {
@ -488,6 +493,10 @@ toggle_segment_delete_func (segPtr, line, treeGone)
* been modified in some way. It's invoked after the * been modified in some way. It's invoked after the
* modifications are complete. * modifications are complete.
* *
* Arguments:
* segPtr : Segment to check
* line : Line that now contains segment
*
* Results: * Results:
* The return value is the head segment in a new list * The return value is the head segment in a new list
* that is to replace the tail of the line that used to * that is to replace the tail of the line that used to
@ -503,9 +512,7 @@ toggle_segment_delete_func (segPtr, line, treeGone)
*/ */
static GtkTextLineSegment * static GtkTextLineSegment *
toggle_segment_cleanup_func (segPtr, line) toggle_segment_cleanup_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line that now contains segment. */
{ {
GtkTextLineSegment *segPtr2, *prevPtr; GtkTextLineSegment *segPtr2, *prevPtr;
int counts; int counts;
@ -563,6 +570,10 @@ toggle_segment_cleanup_func (segPtr, line)
* This procedure is invoked when a toggle segment is about * This procedure is invoked when a toggle segment is about
* to move from one line to another. * to move from one line to another.
* *
* Arguments:
* segPtr : Segment to check
* line : Line that used to contain segment
*
* Results: * Results:
* None. * None.
* *
@ -573,9 +584,7 @@ toggle_segment_cleanup_func (segPtr, line)
*/ */
static void static void
toggle_segment_line_change_func (segPtr, line) toggle_segment_line_change_func (GtkTextLineSegment *segPtr, GtkTextLine *line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line that used to contain segment. */
{ {
if (segPtr->body.toggle.inNodeCounts) if (segPtr->body.toggle.inNodeCounts)
{ {

1
gtk/gtktexttag.c
View file

@ -52,7 +52,6 @@
#include "gtktexttag.h" #include "gtktexttag.h"
#include "gtktexttypes.h" #include "gtktexttypes.h"
#include "gtktexttagtable.h" #include "gtktexttagtable.h"
#include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"

2
gtk/gtktoggleaction.c
View file

@ -228,7 +228,7 @@ gtk_toggle_action_activate (GtkAction *action)
toggle_action->private_data->active = !toggle_action->private_data->active; toggle_action->private_data->active = !toggle_action->private_data->active;
g_object_notify (action, "active"); g_object_notify (G_OBJECT (action), "active");
gtk_toggle_action_toggled (toggle_action); gtk_toggle_action_toggled (toggle_action);
} }

6
gtk/gtktogglebutton.c
View file

@ -76,12 +76,10 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GtkWidgetClass *widget_class; GtkWidgetClass *widget_class;
GtkContainerClass *container_class;
GtkButtonClass *button_class; GtkButtonClass *button_class;
gobject_class = G_OBJECT_CLASS (class); gobject_class = G_OBJECT_CLASS (class);
widget_class = (GtkWidgetClass*) class; widget_class = (GtkWidgetClass*) class;
container_class = (GtkContainerClass*) class;
button_class = (GtkButtonClass*) class; button_class = (GtkButtonClass*) class;
gobject_class->set_property = gtk_toggle_button_set_property; gobject_class->set_property = gtk_toggle_button_set_property;
@ -243,12 +241,8 @@ void
gtk_toggle_button_set_mode (GtkToggleButton *toggle_button, gtk_toggle_button_set_mode (GtkToggleButton *toggle_button,
gboolean draw_indicator) gboolean draw_indicator)
{ {
GtkWidget *widget;
g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button)); g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
widget = GTK_WIDGET (toggle_button);
draw_indicator = draw_indicator ? TRUE : FALSE; draw_indicator = draw_indicator ? TRUE : FALSE;
if (toggle_button->draw_indicator != draw_indicator) if (toggle_button->draw_indicator != draw_indicator)

61
gtk/gtktoolbar.c
View file

@ -38,7 +38,6 @@
#include "gtkseparatortoolitem.h" #include "gtkseparatortoolitem.h"
#include "gtkmenu.h" #include "gtkmenu.h"
#include "gtkradiobutton.h" #include "gtkradiobutton.h"
#include "gtktoolbar.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
@ -243,12 +242,6 @@ static ToolbarContent *toolbar_content_new_tool_item (GtkToolbar
GtkToolItem *item, GtkToolItem *item,
gboolean is_placeholder, gboolean is_placeholder,
gint pos); gint pos);
static ToolbarContent *toolbar_content_new_compatibility (GtkToolbar *toolbar,
GtkToolbarChildType type,
GtkWidget *widget,
GtkWidget *icon,
GtkWidget *label,
gint pos);
static void toolbar_content_remove (ToolbarContent *content, static void toolbar_content_remove (ToolbarContent *content,
GtkToolbar *toolbar); GtkToolbar *toolbar);
static void toolbar_content_free (ToolbarContent *content); static void toolbar_content_free (ToolbarContent *content);
@ -1454,7 +1447,6 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
GtkRequisition arrow_requisition; GtkRequisition arrow_requisition;
gboolean overflowing; gboolean overflowing;
gboolean size_changed; gboolean size_changed;
gdouble elapsed;
GtkAllocation item_area; GtkAllocation item_area;
size_changed = FALSE; size_changed = FALSE;
@ -1735,7 +1727,6 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
} }
} }
elapsed = g_timer_elapsed (priv->timer, NULL);
for (list = priv->content, i = 0; list != NULL; list = list->next, ++i) for (list = priv->content, i = 0; list != NULL; list = list->next, ++i)
{ {
ToolbarContent *content = list->data; ToolbarContent *content = list->data;
@ -3740,7 +3731,6 @@ internal_insert_element (GtkToolbar *toolbar,
gboolean use_stock) gboolean use_stock)
{ {
GtkWidget *box; GtkWidget *box;
ToolbarContent *content;
char *free_me = NULL; char *free_me = NULL;
GtkWidget *child_widget; GtkWidget *child_widget;
@ -3850,9 +3840,6 @@ internal_insert_element (GtkToolbar *toolbar,
tooltip_text, tooltip_private_text); tooltip_text, tooltip_private_text);
} }
content = toolbar_content_new_compatibility (toolbar, type, child_widget,
child_icon, child_label, position);
if (free_me) if (free_me)
g_free (free_me); g_free (free_me);
@ -3927,54 +3914,6 @@ toolbar_content_new_tool_item (GtkToolbar *toolbar,
return content; return content;
} }
static ToolbarContent *
toolbar_content_new_compatibility (GtkToolbar *toolbar,
GtkToolbarChildType type,
GtkWidget *widget,
GtkWidget *icon,
GtkWidget *label,
gint pos)
{
ToolbarContent *content;
GtkToolbarChild *child;
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
content = g_new0 (ToolbarContent, 1);
child = &(content->u.compatibility.child);
content->type = COMPATIBILITY;
child->type = type;
child->widget = widget;
child->icon = icon;
child->label = label;
if (type != GTK_TOOLBAR_CHILD_SPACE)
{
gtk_widget_set_parent (child->widget, GTK_WIDGET (toolbar));
}
else
{
content->u.compatibility.space_visible = TRUE;
gtk_widget_queue_resize (GTK_WIDGET (toolbar));
}
if (type == GTK_TOOLBAR_CHILD_BUTTON ||
type == GTK_TOOLBAR_CHILD_TOGGLEBUTTON ||
type == GTK_TOOLBAR_CHILD_RADIOBUTTON)
{
set_child_packing_and_visibility (toolbar, child);
}
priv->content = g_list_insert (priv->content, content, pos);
toolbar->children = g_list_insert (toolbar->children, child, pos);
priv->need_rebuild = TRUE;
toolbar->num_children++;
return content;
}
static void static void
toolbar_content_remove (ToolbarContent *content, toolbar_content_remove (ToolbarContent *content,
GtkToolbar *toolbar) GtkToolbar *toolbar)

1
gtk/gtktoolbutton.c
View file

@ -32,7 +32,6 @@
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include "gtkiconfactory.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkalias.h" #include "gtkalias.h"

4
gtk/gtktooltips.c
View file

@ -438,9 +438,9 @@ gtk_tooltips_draw_tips (GtkTooltips *tooltips)
else else
y = y + widget->allocation.height + 4; y = y + widget->allocation.height + 4;
toplevel = gtk_widget_get_toplevel (widget); toplevel = GTK_WINDOW (gtk_widget_get_toplevel (widget));
if (toplevel && GTK_IS_WINDOW (toplevel)) if (toplevel && GTK_IS_WINDOW (toplevel))
gtk_window_set_transient_for (tooltips->tip_window, toplevel); gtk_window_set_transient_for (GTK_WINDOW (tooltips->tip_window), toplevel);
gtk_window_move (GTK_WINDOW (tooltips->tip_window), x, y); gtk_window_move (GTK_WINDOW (tooltips->tip_window), x, y);
gtk_widget_show (tooltips->tip_window); gtk_widget_show (tooltips->tip_window);

2
gtk/gtktreedatalist.c
View file

@ -537,7 +537,7 @@ _gtk_tree_data_list_set_header (GList *header_list,
header = g_slice_new0 (GtkTreeDataSortHeader); header = g_slice_new0 (GtkTreeDataSortHeader);
header->sort_column_id = sort_column_id; header->sort_column_id = sort_column_id;
if (list) if (list)
g_list_append (list, header); list = g_list_append (list, header);
else else
header_list = g_list_append (header_list, header); header_list = g_list_append (header_list, header);
} }

7
gtk/gtktreemodelfilter.c
View file

@ -951,7 +951,7 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
{ {
FilterElt *elt, *parent; FilterElt *elt, *parent;
FilterLevel *level, *parent_level; FilterLevel *level, *parent_level;
gint offset, i, length; gint i, length;
gboolean emit_child_toggled = FALSE; gboolean emit_child_toggled = FALSE;
@ -962,7 +962,6 @@ gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
parent_level = level->parent_level; parent_level = level->parent_level;
length = level->array->len; length = level->array->len;
offset = elt->offset;
/* we distinguish a couple of cases: /* we distinguish a couple of cases:
* - root level, length > 1: emit row-deleted and remove. * - root level, length > 1: emit row-deleted and remove.
@ -1604,8 +1603,8 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data); GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
GtkTreePath *path; GtkTreePath *path;
GtkTreeIter iter; GtkTreeIter iter;
FilterElt *elt, *parent; FilterElt *elt, *parent = NULL;
FilterLevel *level, *parent_level; FilterLevel *level, *parent_level = NULL;
gboolean emit_child_toggled = FALSE; gboolean emit_child_toggled = FALSE;
gint offset; gint offset;
gint i; gint i;

6
gtk/gtktreeview.c
View file

@ -5586,7 +5586,6 @@ validate_visible_area (GtkTreeView *tree_view)
GtkRBNode *node = NULL; GtkRBNode *node = NULL;
gboolean need_redraw = FALSE; gboolean need_redraw = FALSE;
gboolean size_changed = FALSE; gboolean size_changed = FALSE;
gboolean update_dy = FALSE;
gint total_height; gint total_height;
gint area_above = 0; gint area_above = 0;
gint area_below = 0; gint area_below = 0;
@ -5611,8 +5610,6 @@ validate_visible_area (GtkTreeView *tree_view)
if (path && !_gtk_tree_view_find_node (tree_view, path, &tree, &node)) if (path && !_gtk_tree_view_find_node (tree_view, path, &tree, &node))
{ {
/* we are going to scroll, and will update dy */ /* we are going to scroll, and will update dy */
update_dy = TRUE;
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path); gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) || if (GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) ||
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID)) GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_COLUMN_INVALID))
@ -5655,8 +5652,6 @@ validate_visible_area (GtkTreeView *tree_view)
else else
{ {
/* row not visible */ /* row not visible */
update_dy = TRUE;
if (dy >= 0 && dy <= tree_view->priv->vadjustment->page_size) if (dy >= 0 && dy <= tree_view->priv->vadjustment->page_size)
{ {
/* row at the beginning -- fixed */ /* row at the beginning -- fixed */
@ -5905,7 +5900,6 @@ validate_visible_area (GtkTreeView *tree_view)
} }
} }
area_above -= ROW_HEIGHT (tree_view, new_height); area_above -= ROW_HEIGHT (tree_view, new_height);
update_dy = TRUE;
} }
/* if we scrolled to a path, we need to set the dy here, /* if we scrolled to a path, we need to set the dy here,

3
gtk/gtkvscale.c
View file

@ -223,9 +223,6 @@ gtk_vscale_get_layout_offsets (GtkScale *scale,
default: default:
g_return_if_reached (); g_return_if_reached ();
*x = 0;
*y = 0;
break;
} }
*x += widget->allocation.x; *x += widget->allocation.x;

1
gtk/gtkwidget.c
View file

@ -48,7 +48,6 @@
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#include <gobject/gobjectnotifyqueue.c> #include <gobject/gobjectnotifyqueue.c>
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkintl.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtktooltips.h" #include "gtktooltips.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"

2
gtk/queryimmodules.c
View file

@ -31,7 +31,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#if USE_LA_MODULES #ifdef USE_LA_MODULES
#define SOEXT ".la" #define SOEXT ".la"
#else #else
#define SOEXT ("." G_MODULE_SUFFIX) #define SOEXT ("." G_MODULE_SUFFIX)

2
gtk/theme-bits/decompose-bits.c
View file

@ -115,7 +115,7 @@ typedef enum {
PART_LAST PART_LAST
} Part; } Part;
const char *part_names[PART_LAST] = { static const char *part_names[PART_LAST] = {
"black", "black",
"dark", "dark",
"mid", "mid",

36
gtk/updateiconcache.c
View file

@ -61,7 +61,7 @@ static gchar *var_name = "-";
#define ALIGN_VALUE(this, boundary) \ #define ALIGN_VALUE(this, boundary) \
(( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1)))
gboolean static gboolean
is_cache_up_to_date (const gchar *path) is_cache_up_to_date (const gchar *path)
{ {
struct stat path_stat, cache_stat; struct stat path_stat, cache_stat;
@ -91,7 +91,7 @@ is_cache_up_to_date (const gchar *path)
return cache_stat.st_mtime >= path_stat.st_mtime; return cache_stat.st_mtime >= path_stat.st_mtime;
} }
gboolean static gboolean
has_theme_index (const gchar *path) has_theme_index (const gchar *path)
{ {
gboolean result; gboolean result;
@ -450,7 +450,7 @@ maybe_cache_image_data (Image *image,
} }
} }
GList * static GList *
scan_directory (const gchar *base_path, scan_directory (const gchar *base_path,
const gchar *subdir, const gchar *subdir,
GHashTable *files, GHashTable *files,
@ -614,7 +614,7 @@ convert_to_hash (gpointer key, gpointer value, gpointer user_data)
return TRUE; return TRUE;
} }
gboolean static gboolean
write_string (FILE *cache, const gchar *n) write_string (FILE *cache, const gchar *n)
{ {
gchar *s; gchar *s;
@ -631,7 +631,7 @@ write_string (FILE *cache, const gchar *n)
} }
gboolean static gboolean
write_card16 (FILE *cache, guint16 n) write_card16 (FILE *cache, guint16 n)
{ {
int i; int i;
@ -643,7 +643,7 @@ write_card16 (FILE *cache, guint16 n)
return i == 1; return i == 1;
} }
gboolean static gboolean
write_card32 (FILE *cache, guint32 n) write_card32 (FILE *cache, guint32 n)
{ {
int i; int i;
@ -656,7 +656,7 @@ write_card32 (FILE *cache, guint32 n)
} }
gboolean static gboolean
write_pixdata (FILE *cache, GdkPixdata *pixdata) write_pixdata (FILE *cache, GdkPixdata *pixdata)
{ {
guint8 *s; guint8 *s;
@ -691,7 +691,7 @@ write_header (FILE *cache, guint32 dir_list_offset)
write_card32 (cache, dir_list_offset)); write_card32 (cache, dir_list_offset));
} }
guint static guint
get_image_meta_data_size (Image *image) get_image_meta_data_size (Image *image)
{ {
gint i; gint i;
@ -719,7 +719,7 @@ get_image_meta_data_size (Image *image)
return len; return len;
} }
guint static guint
get_image_pixel_data_size (Image *image) get_image_pixel_data_size (Image *image)
{ {
if (image->pixel_data_size == 0) if (image->pixel_data_size == 0)
@ -735,7 +735,7 @@ get_image_pixel_data_size (Image *image)
return image->pixel_data_size; return image->pixel_data_size;
} }
guint static guint
get_image_data_size (Image *image) get_image_data_size (Image *image)
{ {
guint len; guint len;
@ -751,7 +751,7 @@ get_image_data_size (Image *image)
return len; return len;
} }
guint static guint
get_single_node_size (HashNode *node, gboolean include_image_data) get_single_node_size (HashNode *node, gboolean include_image_data)
{ {
int len = 0; int len = 0;
@ -778,7 +778,7 @@ get_single_node_size (HashNode *node, gboolean include_image_data)
return len; return len;
} }
guint static guint
get_bucket_size (HashNode *node) get_bucket_size (HashNode *node)
{ {
int len = 0; int len = 0;
@ -792,7 +792,7 @@ get_bucket_size (HashNode *node)
return len; return len;
} }
gboolean static gboolean
write_bucket (FILE *cache, HashNode *node, int *offset) write_bucket (FILE *cache, HashNode *node, int *offset)
{ {
while (node != NULL) while (node != NULL)
@ -1012,7 +1012,7 @@ write_bucket (FILE *cache, HashNode *node, int *offset)
return TRUE; return TRUE;
} }
gboolean static gboolean
write_hash_table (FILE *cache, HashContext *context, int *new_offset) write_hash_table (FILE *cache, HashContext *context, int *new_offset)
{ {
int offset = HASH_OFFSET; int offset = HASH_OFFSET;
@ -1060,7 +1060,7 @@ write_hash_table (FILE *cache, HashContext *context, int *new_offset)
return TRUE; return TRUE;
} }
gboolean static gboolean
write_dir_index (FILE *cache, int offset, GList *directories) write_dir_index (FILE *cache, int offset, GList *directories)
{ {
int n_dirs; int n_dirs;
@ -1094,7 +1094,7 @@ write_dir_index (FILE *cache, int offset, GList *directories)
return TRUE; return TRUE;
} }
gboolean static gboolean
write_file (FILE *cache, GHashTable *files, GList *directories) write_file (FILE *cache, GHashTable *files, GList *directories)
{ {
HashContext context; HashContext context;
@ -1140,7 +1140,7 @@ write_file (FILE *cache, GHashTable *files, GList *directories)
return TRUE; return TRUE;
} }
void static void
build_cache (const gchar *path) build_cache (const gchar *path)
{ {
gchar *cache_path, *tmp_cache_path; gchar *cache_path, *tmp_cache_path;
@ -1243,7 +1243,7 @@ build_cache (const gchar *path)
g_printerr (_("Cache file created successfully.\n")); g_printerr (_("Cache file created successfully.\n"));
} }
void static void
write_csource (const gchar *path) write_csource (const gchar *path)
{ {
gchar *cache_path; gchar *cache_path;

2
gtk/xdgmime/xdgmimealias.c
View file

@ -105,7 +105,7 @@ _xdg_mime_alias_list_lookup (XdgAliasList *list,
if (list->n_aliases > 0) if (list->n_aliases > 0)
{ {
key.alias = (char *)alias; key.alias = (char *)alias;
key.mime_type = 0; key.mime_type = NULL;
entry = bsearch (&key, list->aliases, list->n_aliases, entry = bsearch (&key, list->aliases, list->n_aliases,
sizeof (XdgAlias), alias_entry_cmp); sizeof (XdgAlias), alias_entry_cmp);