stylecontext: Do invalidation on first resize container

[~andy/gtk] / gdk / gdkmain.h

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index b9915a3bcfd3f1632be94d5f9bb5b4ea9075c4d6..27788dd2daa0965bd91d49e042a1874cfee7d528 100644 (file)
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.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/>.
  */
 
 /*
@@ -24,13 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_MAIN_H__
+#define __GDK_MAIN_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_MAIN_H__
-#define __GDK_MAIN_H__
-
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS
@@ -50,31 +49,7 @@ gboolean              gdk_init_check                      (gint           *argc,
 void                  gdk_add_option_entries_libgtk_only  (GOptionGroup   *group);
 void                  gdk_pre_parse_libgtk_only           (void);
 
-/**
- * gdk_set_locale:
- *
- * Initializes the support for internationalization by calling the <function>setlocale()</function>
- * system call. This function is called by gtk_set_locale() and so GTK+
- * applications should use that instead.
- *
- * The locale to use is determined by the <envar>LANG</envar> environment variable,
- * so to run an application in a certain locale you can do something like this:
- * <informalexample>
- * <programlisting>
- *   export LANG="fr"
- *   ... run application ...
- * </programlisting>
- * </informalexample>
- *
- * If the locale is not supported by X then it is reset to the standard "C"
- * locale.
- *
- * Returns: the resulting locale.
- */
-gchar*                gdk_set_locale                      (void);
-void                  gdk_disable_multidevice             (void);
-
-G_CONST_RETURN gchar *gdk_get_program_class               (void);
+const gchar *         gdk_get_program_class               (void);
 void                  gdk_set_program_class               (const gchar    *program_class);
 
 void                  gdk_notify_startup_complete         (void);
@@ -88,35 +63,41 @@ G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop         (void);
 void                           gdk_error_trap_pop_ignored (void);
 
 
-G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
+const gchar *         gdk_get_display_arg_name (void);
 
 /**
  * gdk_get_display:
  *
- * Gets the name of the display, which usually comes from the <envar>DISPLAY</envar>
- * environment variable or the <option>--display</option> command line option.
+ * Gets the name of the display, which usually comes from the
+ * <envar>DISPLAY</envar> environment variable or the
+ * <option>--display</option> command line option.
  *
  * Returns: the name of the display.
  */
-gchar*               gdk_get_display          (void);
+gchar*        gdk_get_display        (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_grab)
 GdkGrabStatus gdk_pointer_grab       (GdkWindow    *window,
-                                     gboolean      owner_events,
-                                     GdkEventMask  event_mask,
-                                     GdkWindow    *confine_to,
-                                     GdkCursor    *cursor,
-                                     guint32       time_);
+                                      gboolean      owner_events,
+                                      GdkEventMask  event_mask,
+                                      GdkWindow    *confine_to,
+                                      GdkCursor    *cursor,
+                                      guint32       time_);
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_grab)
 GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
-                                     gboolean      owner_events,
-                                     guint32       time_);
+                                      gboolean      owner_events,
+                                      guint32       time_);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
 #ifndef GDK_MULTIHEAD_SAFE
 
 #ifndef GDK_MULTIDEVICE_SAFE
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void          gdk_pointer_ungrab     (guint32       time_);
+GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
 void          gdk_keyboard_ungrab    (guint32       time_);
+GDK_DEPRECATED_IN_3_0_FOR(gdk_display_device_is_grabbed)
 gboolean      gdk_pointer_is_grabbed (void);
 #endif /* GDK_MULTIDEVICE_SAFE */
 
@@ -134,6 +115,8 @@ void gdk_beep (void);
 
 void gdk_flush (void);
 
+void gdk_disable_multidevice (void);
+
 G_END_DECLS
 
 #endif /* __GDK_MAIN_H__ */