x11: Use _gdk_x11_get_xatom_for_display_printf()

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

diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index cb53025c461c5472aea28f19cfd8e68c3b8a443f..af141dca6c083532e75f9a531a3c64141c0111ce 100644 (file)
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -13,63 +13,47 @@
  * 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/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
+#define __GDK_APP_LAUNCH_CONTEXT_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
-#define __GDK_APP_LAUNCH_CONTEXT_H__
-
 #include <gio/gio.h>
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdktypes.h>
 #include <gdk/gdkscreen.h>
 
 G_BEGIN_DECLS
 
 #define GDK_TYPE_APP_LAUNCH_CONTEXT         (gdk_app_launch_context_get_type ())
 #define GDK_APP_LAUNCH_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContext))
-#define GDK_APP_LAUNCH_CONTEXT_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
-#define GDK_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_IS_APP_LAUNCH_CONTEXT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GDK_TYPE_APP_LAUNCH_CONTEXT))
-#define GDK_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_APP_LAUNCH_CONTEXT, GdkAppLaunchContextClass))
-
-typedef struct GdkAppLaunchContext           GdkAppLaunchContext;
-typedef struct GdkAppLaunchContextClass       GdkAppLaunchContextClass;
-typedef struct GdkAppLaunchContextPrivate     GdkAppLaunchContextPrivate;
-
-struct GdkAppLaunchContext
-{
-  GAppLaunchContext parent_instance;
-
-  GdkAppLaunchContextPrivate *priv;
-};
+        #define GDK_IS_APP_LAUNCH_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_APP_LAUNCH_CONTEXT))
 
-struct GdkAppLaunchContextClass
-{
-  GAppLaunchContextClass parent_class;
-};
 
 GType                gdk_app_launch_context_get_type      (void);
 
+GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context)
 GdkAppLaunchContext *gdk_app_launch_context_new           (void);
+GDK_DEPRECATED_IN_3_0_FOR(gdk_display_get_app_launch_context)
 void                 gdk_app_launch_context_set_display   (GdkAppLaunchContext *context,
-                                                          GdkDisplay          *display);
+                                                           GdkDisplay          *display);
 void                 gdk_app_launch_context_set_screen    (GdkAppLaunchContext *context,
-                                                          GdkScreen           *screen);
+                                                           GdkScreen           *screen);
 void                 gdk_app_launch_context_set_desktop   (GdkAppLaunchContext *context,
-                                                          gint                 desktop);
+                                                           gint                 desktop);
 void                 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
-                                                          guint32              timestamp);
+                                                           guint32              timestamp);
 void                 gdk_app_launch_context_set_icon      (GdkAppLaunchContext *context,
-                                                          GIcon               *icon);
+                                                           GIcon               *icon);
 void                 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
-                                                          const char          *icon_name);
+                                                           const char          *icon_name);
 
 G_END_DECLS