]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkprivate.h
Bug 663856 - Make option-foo accelerators use the right symbol
[~andy/gtk] / gtk / gtkprivate.h
index c0f14b4f328dc4abab8ccc3f2e0fb968e5ff311a..e243199bc34efac8be8b25489172be7e7d5d6f98 100644 (file)
@@ -8,7 +8,7 @@
  *
  * 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
+ * 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 Lesser General Public
 #ifndef __GTK_PRIVATE_H__
 #define __GTK_PRIVATE_H__
 
-#include <gtk/gtkwidget.h>
+#include <glib-object.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
-void         _gtk_widget_set_visible_flag   (GtkWidget *widget,
-                                             gboolean   visible);
-gboolean     _gtk_widget_get_resize_pending (GtkWidget *widget);
-void         _gtk_widget_set_resize_pending (GtkWidget *widget,
-                                             gboolean   resize_pending);
-gboolean     _gtk_widget_get_in_reparent    (GtkWidget *widget);
-void         _gtk_widget_set_in_reparent    (GtkWidget *widget,
-                                             gboolean   in_reparent);
-gboolean     _gtk_widget_get_anchored       (GtkWidget *widget);
-void         _gtk_widget_set_anchored       (GtkWidget *widget,
-                                             gboolean   anchored);
-gboolean     _gtk_widget_get_shadowed       (GtkWidget *widget);
-void         _gtk_widget_set_shadowed       (GtkWidget *widget,
-                                             gboolean   shadowed);
-gboolean     _gtk_widget_get_alloc_needed   (GtkWidget *widget);
-void         _gtk_widget_set_alloc_needed   (GtkWidget *widget,
-                                             gboolean   alloc_needed);
-gboolean     _gtk_widget_get_width_request_needed  (GtkWidget *widget);
-void         _gtk_widget_set_width_request_needed  (GtkWidget *widget,
-                                                    gboolean   width_request_needed);
-gboolean     _gtk_widget_get_height_request_needed (GtkWidget *widget);
-void         _gtk_widget_set_height_request_needed (GtkWidget *widget,
-                                                    gboolean   height_request_needed);
+#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
 
-#ifdef G_OS_WIN32
+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);
 
-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 ();
+gboolean      _gtk_fnmatch                (const char *pattern,
+                                           const char *string,
+                                           gboolean    no_leading_period);
 
-#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 ()
+gchar       * _gtk_get_lc_ctype           (void);
 
-#endif /* G_OS_WIN32 */
+gboolean _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
 
-gboolean _gtk_fnmatch (const char *pattern,
-                      const char *string,
-                      gboolean    no_leading_period);
+gboolean _gtk_single_string_accumulator   (GSignalInvocationHint *ihint,
+                                           GValue                *return_accu,
+                                           const GValue          *handler_return,
+                                           gpointer               dummy);
 
-#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
+GdkModifierType _gtk_replace_virtual_modifiers (GdkKeymap       *keymap,
+                                                GdkModifierType  modifiers);
+GdkModifierType _gtk_get_primary_accel_mod     (void);
 
-/* 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. */
+/* temp hack, will go away soon --mitch */
 #ifndef GDK_WINDOWING_QUARTZ
-#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_CONTROL_MASK
+#define GTK_TOGGLE_GROUP_MOD_MASK 0
 #else
-#define GTK_DEFAULT_ACCEL_MOD_MASK GDK_META_MASK
+#define GTK_TOGGLE_GROUP_MOD_MASK GDK_MOD1_MASK
 #endif
 
-
-/* With GtkWidget     , a widget may be requested
- * its width for 2 or maximum 3 heights in one resize
- * (Note this define is limited by the bitfield sizes
- * defined on the SizeRequestCache structure).
- */
-#define GTK_SIZE_REQUEST_CACHED_SIZES 3
-
-typedef struct
-{
-  gint   for_size;
-  gint   minimum_size;
-  gint   natural_size;
-} SizeRequest;
-
-typedef struct {
-  SizeRequest widths[GTK_SIZE_REQUEST_CACHED_SIZES];
-  SizeRequest heights[GTK_SIZE_REQUEST_CACHED_SIZES];
-  guint       cached_widths : 2;
-  guint       cached_heights : 2;
-  guint       last_cached_width : 2;
-  guint       last_cached_height : 2;
-} SizeRequestCache;
-
+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