diff options
author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2003-12-01 18:40:39 +0000 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2003-12-01 18:40:39 +0000 |
commit | aa66a642c1fc139f3a7db4d98dd033bc47d84e05 (patch) | |
tree | f37f8f2ea912222a58596107143d0f9823af131f /libjava/gnu/awt/gtk/gtkcommon.h | |
parent | dc170a876af22c8edc00e48943983144bc442334 (diff) | |
download | gcc-aa66a642c1fc139f3a7db4d98dd033bc47d84e05.zip gcc-aa66a642c1fc139f3a7db4d98dd033bc47d84e05.tar.gz gcc-aa66a642c1fc139f3a7db4d98dd033bc47d84e05.tar.bz2 |
GtkButtonPeer.java, [...]: Remove files.
2003-12-01 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/awt/gtk/GtkButtonPeer.java, gnu/awt/gtk/gtkcommon.cc,
gnu/awt/gtk/gtkcommon.h, gnu/awt/gtk/GtkComponentPeer.java,
gnu/awt/gtk/GtkContainerPeer.java,
gnu/awt/gtk/GtkFramePeer.java, gnu/awt/gtk/GtkLabelPeer.java,
gnu/awt/gtk/GtkMainThread.java, gnu/awt/gtk/GtkToolkit.java,
gnu/awt/gtk/GtkWindowPeer.java, gnu/awt/gtk/natGtkButtonPeer.cc,
gnu/awt/gtk/natGtkComponentPeer.cc,
gnu/awt/gtk/natGtkContainerPeer.cc,
gnu/awt/gtk/natGtkFramePeer.cc, gnu/awt/gtk/natGtkLabelPeer.cc,
gnu/awt/gtk/natGtkMainThread.cc, gnu/awt/gtk/natGtkToolkit.cc,
gnu/awt/gtk/natGtkWindowPeer.cc: Remove files.
From-SVN: r74118
Diffstat (limited to 'libjava/gnu/awt/gtk/gtkcommon.h')
-rw-r--r-- | libjava/gnu/awt/gtk/gtkcommon.h | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/libjava/gnu/awt/gtk/gtkcommon.h b/libjava/gnu/awt/gtk/gtkcommon.h deleted file mode 100644 index 207d2cf..0000000 --- a/libjava/gnu/awt/gtk/gtkcommon.h +++ /dev/null @@ -1,85 +0,0 @@ -// -*- c++ -*- -// gtkutils.h - Common defines and inline functions for the gtk AWT peers. - -/* Copyright (C) 2000 Free Software Foundation - - This file is part of libgcj. - -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ - -#ifndef __GTKCOMMON_H__ -#define __GTKCOMMON_H__ - -#include <gtk/gtk.h> -#include <gdk/gdkx.h> - -#include <java/awt/Color.h> - -class _Jv_GdkThreadLock -{ -public: - _Jv_GdkThreadLock () - { - GDK_THREADS_ENTER (); - } - - ~_Jv_GdkThreadLock () - { - GDK_THREADS_LEAVE (); - } -}; - -// Convert AWT Color to gdk color value. -static inline void -_Jv_ConvertAwtColor(java::awt::Color* awtcolor, GdkColor* gdkcolor) -{ - jint rgb = awtcolor->getRGB(); - gushort r = (rgb >> 16) & 0xFF; - gushort g = (rgb >> 8) & 0xFF; - gushort b = rgb & 0xFF; - - gdkcolor->red = (r << 8) + r; - gdkcolor->green = (g << 8) + g; - gdkcolor->blue = (b << 8) + b; - - // FIXME: Deal with colormap? gdk_color_alloc()? -} - -// Convert gdk color value to AWT Color. -static inline java::awt::Color* -_Jv_ConvertGtkColor (GdkColor* gdkcolor) -{ - jint r = gdkcolor->red >> 8; - jint g = gdkcolor->green >> 8; - jint b = gdkcolor->blue >> 8; - - java::awt::Color *c = new java::awt::Color(r,g,b); - - return c; -} - -static inline void -_Jv_GdkScaleColor (GdkColor* oldc, GdkColor* newc, gfloat scale) -{ - // FIXME: Need to deal with overflows or find a better way - *newc = *oldc; - newc->red += (gushort) (newc->red * scale); - newc->green += (gushort) (newc->green * scale); - newc->blue += (gushort) (newc->blue * scale); -} - -// Normally the X queue gets flushed automatically when gtk's event loop goes -// idle. However, some calls do not cause any activitity on the event loop, -// so we need to occasionally flush pending requests manually because we arn't -// running from the gtk_main thread. Note that gdk_flush calls XSync(), which -// is more than what is needed here. -static inline void -_Jv_FlushRequests () -{ - // FIXME: What about platforms that arn't X? - XFlush (GDK_DISPLAY ()); -} - -#endif /* __GTKUTILS_H__ */ |