[Gd-chatter] r11542 - branches/opendylan-melange/gtk

[andreas at gwydiondylan.org]

Author: andreas
Date: Fri Dec 14 00:26:04 2007
New Revision: 11542

Modified:
   branches/opendylan-melange/gtk/gtk.dylan
   branches/opendylan-melange/gtk/support.c
Log:
job: fd

Remove Fixed hack.


Modified: branches/opendylan-melange/gtk/gtk.dylan
==============================================================================
--- branches/opendylan-melange/gtk/gtk.dylan	(original)
+++ branches/opendylan-melange/gtk/gtk.dylan	Fri Dec 14 00:26:04 2007
@@ -67,18 +67,6 @@
   c-name: "gtk_set_button_time";
 end;
 
-define C-subtype <_Fixed> (<_GtkFixed>) end;
-define constant <Fixed> = <_Fixed>;
-define C-function fixed-new
-  result fixed :: <GtkWidget>;
-  c-name: "fixed_new";
-end;
-
-define C-function fixed-get-type
-  result type :: <GType>;
-  c-name: "fixed_get_type";
-end;
-
 define macro with-gdk-lock
   { with-gdk-lock ?:body end }
  =>
@@ -353,8 +341,6 @@
           => make(<GtkTreeIter>, address: address-thunk());
         gtk-tree-path-get-type()
           => make(<GtkTreePath>, address: address-thunk());
-        fixed-get-type()
-          => make(<Fixed>, address: address-thunk());
         otherwise       => error("Unknown Gtype %=", g-type);
       end select;
     end if;

Modified: branches/opendylan-melange/gtk/support.c
==============================================================================
--- branches/opendylan-melange/gtk/support.c	(original)
+++ branches/opendylan-melange/gtk/support.c	Fri Dec 14 00:26:04 2007
@@ -2,48 +2,9 @@
 #include <gtk/gtkwidget.h>
 #include <gdk/gdkwindow.h>
 #include <gtk/gtkdialog.h>
-#include <gtk/gtkfixed.h>
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkmenu.h>
 
-typedef GtkFixed Fixed;
-typedef GtkFixedClass FixedClass;
-
-static void fixed_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-
-G_DEFINE_TYPE (Fixed, fixed, GTK_TYPE_FIXED)
-
-static void
-fixed_class_init (FixedClass *class) {
-  GTK_WIDGET_CLASS(class)->size_allocate = fixed_size_allocate;
-}
-
-static void
-fixed_init (Fixed *fixed) {
-}
-
-GtkWidget *
-fixed_new (void)
-{
-  return g_object_new (fixed_get_type (), NULL);
-}
-
-static void
-fixed_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-
-  widget->allocation = *allocation;
-
-  if (!GTK_WIDGET_NO_WINDOW (widget))
-    {
-      if (GTK_WIDGET_REALIZED (widget))
-	gdk_window_move_resize (widget->window,
-				allocation->x, 
-				allocation->y,
-				allocation->width, 
-				allocation->height);
-    }
-}
 
 GType g_type_from_instance (GTypeInstance* instance) {
     return G_TYPE_FROM_INSTANCE(instance);
@@ -103,6 +64,5 @@
 }
   
 void popup_gtk_menu (GtkMenu* menu, guint button) {
-  g_print("%d mytime\n", mytime);
   gtk_menu_popup(menu, NULL, NULL, NULL, NULL, button, mytime);
 }