X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkprivate.h;h=5b05f5bb47d144a605c3d225c3b6f697b020fdc0;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=57789584b215236693391c292e2f33993f7c0686;hpb=b663f3a00bc3d9a5f1e17eebe742ee14504fdcac;p=~andy%2Fgtk

diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h
index 57789584b..5b05f5bb4 100644
--- a/gtk/gtkprivate.h
+++ b/gtk/gtkprivate.h
@@ -12,9 +12,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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -27,81 +25,67 @@
 #ifndef __GTK_PRIVATE_H__
 #define __GTK_PRIVATE_H__
 
-#include <glib.h>
+#include <glib-object.h>
+#include <gdk/gdk.h>
 
-#include "gtksettings.h"
+#include "gtkcsstypesprivate.h"
+#include "gtktexthandleprivate.h"
 
 G_BEGIN_DECLS
 
-#ifdef G_OS_WIN32
-
-const gchar *_gtk_get_datadir ();
-const gchar *_gtk_get_libdir ();
-const gchar *_gtk_get_sysconfdir ();
-const gchar *_gtk_get_localedir ();
-const gchar *_gtk_get_data_prefix ();
-
-#undef GTK_DATADIR
-#define GTK_DATADIR _gtk_get_datadir ()
-#undef GTK_LIBDIR
-#define GTK_LIBDIR _gtk_get_libdir ()
-#undef GTK_LOCALEDIR
-#define GTK_LOCALEDIR _gtk_get_localedir ()
-#undef GTK_SYSCONFDIR
-#define GTK_SYSCONFDIR _gtk_get_sysconfdir ()
-#undef GTK_DATA_PREFIX
-#define GTK_DATA_PREFIX _gtk_get_data_prefix ()
-
-#endif /* G_OS_WIN32 */
-
 #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
 
-/* Many keyboard shortcuts for Mac are the same as for X
- * except they use Command key instead of Control (e.g. Cut,
- * Copy, Paste). This symbol is for those simple cases. */
-#ifndef GDK_WINDOWING_QUARTZ
-#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_CONTROL_MASK
-#else
-#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_META_MASK
-#endif
-
-/* When any of these modifiers are active, a key
- * event cannot produce a symbol, so should be
- * skipped when handling text input
- */
-#ifndef GDK_WINDOWING_QUARTZ
-#define GTK_NO_TEXT_INPUT_MOD_MASK (GDK_MOD1_MASK | GDK_CONTROL_MASK)
+#ifdef G_DISABLE_CAST_CHECKS
+/* This is true for debug no and minimum */
+#define gtk_internal_return_if_fail(__expr) G_STMT_START{ (void)0; }G_STMT_END
+#define gtk_internal_return_val_if_fail(__expr, __val) G_STMT_START{ (void)0; }G_STMT_END
 #else
-#define GTK_NO_TEXT_INPUT_MOD_MASK (GDK_MOD2_MASK | GDK_CONTROL_MASK)
+/* This is true for debug yes */
+#define gtk_internal_return_if_fail(__expr) g_return_if_fail(__expr)
+#define gtk_internal_return_val_if_fail(__expr, __val) g_return_val_if_fail(__expr, __val)
 #endif
 
-#ifndef GDK_WINDOWING_QUARTZ
-#define GTK_EXTEND_SELECTION_MOD_MASK GDK_SHIFT_MASK
-#define GTK_MODIFY_SELECTION_MOD_MASK GDK_CONTROL_MASK
-#else
-#define GTK_EXTEND_SELECTION_MOD_MASK GDK_SHIFT_MASK
-#define GTK_MODIFY_SELECTION_MOD_MASK GDK_MOD2_MASK
-#endif
-
-gboolean _gtk_fnmatch      (const char *pattern,
-                            const char *string,
-                            gboolean    no_leading_period);
-
-gchar   *_gtk_get_lc_ctype (void);
-
-gchar * _gtk_find_module              (const gchar  *name,
-                                       const gchar  *type);
-gchar **_gtk_get_module_path          (const gchar  *type);
-
-void    _gtk_modules_init             (gint          *argc,
-                                       gchar       ***argv,
-                                       const gchar   *gtk_modules_args);
-void    _gtk_modules_settings_changed (GtkSettings   *settings,
-                                       const gchar   *modules);
-
-gboolean _gtk_button_event_triggers_context_menu (GdkEventButton *event);
+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);
+
+gchar       * _gtk_get_lc_ctype           (void);
+
+gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
+
+gboolean _gtk_single_string_accumulator   (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
+
+GdkModifierType _gtk_replace_virtual_modifiers (GdkKeymap       *keymap,
+                                                GdkModifierType  modifiers);
+GdkModifierType _gtk_get_primary_accel_mod     (void);
+
+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);
+
+gboolean        _gtk_propagate_captured_event  (GtkWidget       *widget,
+                                                GdkEvent        *event,
+                                                GtkWidget       *topmost);
 
 G_END_DECLS