filechooser: Rename _gtk_file_is_path_not_local() to _gtk_file_has_native_path()

[~andy/gtk] / gtk / gtktextdisplay.h

diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index acbc5f9727f043f609273207214a67ca5935eefe..3f130b4ba9a8a88fd6ca26fa127518d3610ff280 100644 (file)
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -7,9 +7,9 @@
  *
  * This file can be used under your choice of two licenses, the LGPL
  * and the original Tk license.
- * 
+ *
  * LGPL:
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,8 +21,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Original Tk license:
  *
@@ -30,7 +29,7 @@
  * California, Sun Microsystems, Inc., and other parties.  The
  * following terms apply to all files associated with the software
  * unless explicitly disclaimed in individual files.
- * 
+ *
  * The authors hereby grant permission to use, copy, modify,
  * distribute, and license this software and its documentation for any
  * purpose, provided that existing copyright notices are retained in
@@ -40,13 +39,13 @@
  * software may be copyrighted by their authors and need not follow
  * the licensing terms described here, provided that the new terms are
  * clearly indicated on the first page of each file where they apply.
- * 
+ *
  * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
  * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
  * DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
  * OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
+ *
  * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -74,14 +73,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#ifndef GTK_TEXT_DISPLAY_H
-#define GTK_TEXT_DISPLAY_H
+#ifndef __GTK_TEXT_DISPLAY_H__
+#define __GTK_TEXT_DISPLAY_H__
 
 #include <gtk/gtktextlayout.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* A semi-public header intended for use by code that also
  * uses GtkTextLayout
@@ -89,25 +86,16 @@ extern "C" {
 
 /* The drawable should be pre-initialized to your preferred background.
  * widget            - Widget to grab some style info from
- * drawable          - Drawable to render to
- * x_offset/y_offset - Position of the drawable in layout coordinates
- * x/y/width/height  - Region of the layout to render. x,y must be inside
- *                     the drawable.
+ * cr                - Context to render to, matrix set so that (0, 0)
+ *                     is the top left of the layout
+ * widgets           - list of widgets that need exposing
  */
-void gtk_text_layout_draw (GtkTextLayout       *layout,
-                          GtkWidget            *widget, 
-                          GdkDrawable          *drawable,
-                          gint                  x_offset,
-                          gint                  y_offset,
-                          gint                  x,
-                          gint                  y,
-                          gint                  width,
-                          gint                  height);
-
+void gtk_text_layout_draw (GtkTextLayout        *layout,
+                           GtkWidget            *widget,
+                           cairo_t              *cr,
+                           GList               **widgets);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* GTK_TEXT_DISPLAY_H */
+#endif  /* __GTK_TEXT_DISPLAY_H__ */