X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprivate.h;h=63860a21a0fbd48167aab2ce6e6ee63351b41f06;hb=9d0febc9a64a5bfb0fcfc3a88de4757f6c1ff090;hp=2164f0998eefe0b2e3544bdf48f911e211d11920;hpb=df0b05ef2b80946feeb3487582a19bd455783a03;p=~andy%2Fgtk

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 2164f0998..63860a21a 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -2,73 +2,76 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
 #ifndef __GTK_PRIVATE_H__
 #define __GTK_PRIVATE_H__
 
+#include <glib-object.h>
+#include <gdk/gdk.h>
 
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
+#include "gtkcsstypesprivate.h"
 
+G_BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 
+const gchar * _gtk_get_datadir            (void);
+const gchar * _gtk_get_libdir             (void);
+const gchar * _gtk_get_sysconfdir         (void);
+const gchar * _gtk_get_localedir          (void);
+const gchar * _gtk_get_data_prefix        (void);
 
+gboolean      _gtk_fnmatch                (const char *pattern,
+                                           const char *string,
+                                           gboolean    no_leading_period);
 
-/* The private flags that are used in the private_flags member of GtkWidget.
- */
-enum
-{
-  PRIVATE_GTK_USER_STYLE	= 1 <<  0,
-  PRIVATE_GTK_REDRAW_PENDING	= 1 <<  1,
-  PRIVATE_GTK_RESIZE_PENDING	= 1 <<  2,
-  PRIVATE_GTK_RESIZE_NEEDED	= 1 <<  3,
-  PRIVATE_GTK_LEAVE_PENDING	= 1 <<  4,
-  PRIVATE_GTK_HAS_SHAPE_MASK	= 1 <<  5,
-  PRIVATE_GTK_IN_REPARENT       = 1 <<  6
-};
+gchar       * _gtk_get_lc_ctype           (void);
 
-/* Macros for extracting a widgets private_flags from GtkWidget.
- */
-#define GTK_PRIVATE_FLAGS(wid)            (GTK_WIDGET (wid)->private_flags)
-#define GTK_WIDGET_USER_STYLE(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE)
-#define GTK_WIDGET_REDRAW_PENDING(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_PENDING)
-#define GTK_CONTAINER_RESIZE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING)
-#define GTK_WIDGET_RESIZE_NEEDED(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_NEEDED)
-#define GTK_WIDGET_LEAVE_PENDING(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING)
-#define GTK_WIDGET_HAS_SHAPE_MASK(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK)
-#define GTK_WIDGET_IN_REPARENT(obj)	  (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_IN_REPARENT)
+gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
 
-/* Macros for setting and clearing private widget flags.
- * we use a preprocessor string concatenation here for a clear
- * flags/private_flags distinction at the cost of single flag operations.
- */
-#define GTK_PRIVATE_SET_FLAG(wid,flag)    G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
-#define GTK_PRIVATE_UNSET_FLAG(wid,flag)  G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) &= ~(PRIVATE_ ## flag)); }G_STMT_END
+gboolean _gtk_single_string_accumulator   (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
 
-/* True if there is a good chance the mb functions will handle things
- * correctly - set if either mblen("\xc0", MB_CUR_MAX) == 1 in the
- * C locale, or were using X's mb functions. (-DX_LOCALE && locale != C)
- */
-extern gint gtk_use_mb;
+GdkModifierType _gtk_replace_virtual_modifiers (GdkKeymap       *keymap,
+                                                GdkModifierType  modifiers);
+GdkModifierType _gtk_get_primary_accel_mod     (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+gboolean _gtk_translate_keyboard_accel_state   (GdkKeymap       *keymap,
+                                                guint            hardware_keycode,
+                                                GdkModifierType  state,
+                                                GdkModifierType  accel_mask,
+                                                gint             group,
+                                                guint           *keyval,
+                                                gint            *effective_group,
+                                                gint            *level,
+                                                GdkModifierType *consumed_modifiers);
 
+G_END_DECLS
 
 #endif /* __GTK_PRIVATE_H__ */