head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2002.10.24.16.37.31; author dillo; state dead; branches; next 1.1; 1.1 date 2001.05.18.09.52.00; author dillo; state Exp; branches; next ; desc @@ 1.2 log @remove unneeded patches -- should have been done during package update @ text @$NetBSD: patch-ac,v 1.1 2001/05/18 09:52:00 dillo Exp $ --- xwin.c.orig Mon May 7 10:43:45 2001 +++ xwin.c Fri May 18 05:43:27 2001 @@@@ -100,7 +100,7 @@@@ {"/Help/_About", NULL, pilrcui_about_create, 0, NULL} }; -static int CurrentForm = -1; +static p_int CurrentForm = -1; void pilrcui_open(GtkWidget * w, @@@@ -275,7 +275,7 @@@@ { GtkStateType state; PLEXFORMOBJLIST *pplt; - RCFORM *pform; + RCFormBA16Type *pform; FRM *pfrm; int ilt; static GdkGC *pens[5] = { NULL, NULL, NULL, NULL, NULL }; @@@@ -321,8 +321,8 @@@@ pfrm = (FRM *) PlexGetElementAt(&vprcpfile->plfrm, CurrentForm); - pform = &pfrm->form; - pplt = &pfrm->pllt; + pform = &pfrm->s16.form; + pplt = &pfrm->s16.pllt; /* * Select pen based on pform->window.frameType.width @@@@ -374,19 +374,19 @@@@ { RCFORMOBJLIST *plt; RCFORMOBJECT *pobj; - RCFIELD field; - RCFORMLABEL label; + RCFieldBA16Type field; + RCFormLabelBA16Type label; RCRECT rc; char *pchText; int savepen; plt = (RCFORMOBJLIST *) PlexGetElementAt(pplt, ilt); - pobj = &plt->u.object; + pobj = &plt->s16.u.object; pchText = NULL; - switch (plt->objectType) + switch (plt->s16.objectType) { case frmFieldObj: - field = *pobj->field; + field = pobj->field->s16; if (!field.attr.usable) break; if (field.attr.underlined) @@@@ -434,13 +434,13 @@@@ break; case frmControlObj: { - RCCONTROL ctl; + RCControlBA16Type ctl; - ctl = *pobj->control; + ctl = pobj->control->s16; if (!ctl.attr.usable) break; - pchText = pobj->control->u.text; + pchText = pobj->control->s16.u.text; switch (ctl.style) { case buttonCtl: @@@@ -563,12 +563,12 @@@@ break; case frmListObj: { - RCLIST list; + RCListBA16Type list; RCRECT rc; char *s; int x; - list = *pobj->list; + list = pobj->list->s16; if (!list.attr.usable) break; gdk_draw_rectangle(GTK_WIDGET(w)->window, pens[pen], FALSE, @@@@ -616,9 +616,9 @@@@ break; case frmBitmapObj: { - RCFORMBITMAP bitmap; + RCFormBitMapBA16Type bitmap; - bitmap = *pobj->bitmap; + bitmap = pobj->bitmap->s16; if (!bitmap.attr.usable) break; @@@@ -631,10 +631,10 @@@@ case frmRectangleObj: break; case frmLabelObj: - label = *pobj->label; + label = pobj->label->s16; if (!label.attr.usable) break; - pchText = pobj->label->text; + pchText = pobj->label->s16.text; rc.topLeft = label.pos; pilrcui_pilot_text(w, pchText, org, &rc, label.fontID, ptxLeft | ptxNoExtent); @@@@ -752,7 +752,7 @@@@ pilrcui_form_select(GtkWidget * w, gpointer ifrm) { - CurrentForm = (int)ifrm; + CurrentForm = (p_int)ifrm; pilrcui_drawform(GTK_DRAWING_AREA(FormArea)); } @@@@ -808,11 +808,13 @@@@ GtkWidget *menuitem; sprintf(buf, "Form %04x", - ((FRM *) PlexGetElementAt(&vprcpfile->plfrm, ifrm))->form.formId); + (int)((FRM *) PlexGetElementAt(&vprcpfile->plfrm, ifrm)) + ->s16.form.formId); menuitem = gtk_radio_menu_item_new_with_label(group, buf); group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(menuitem)); gtk_signal_connect(GTK_OBJECT(menuitem), "activate", - (GtkSignalFunc) pilrcui_form_select, (gpointer) ifrm); + (GtkSignalFunc) pilrcui_form_select, + (gpointer) (p_int)ifrm); gtk_menu_append(GTK_MENU(menu), menuitem); gtk_widget_show(menuitem); } @@@@ -1104,6 +1106,7 @@@@ * gtk_rc_parse ("filerc"); */ + CbInit(); create_main_window(); gtk_main(); @ 1.1 log @fix pilrcui, bump version to 2.8.4nb1 @ text @d1 1 a1 1 $NetBSD$ @