>From [EMAIL PROTECTED] Thu May 3 11:45:14 2001
Return-Path: <[EMAIL PROTECTED]>
Delivered-To: [EMAIL PROTECTED]
Received: from wet-pants (wet-pants.ximian.com [141.154.95.105])
by parsons.abisource.com (Postfix) with ESMTP id 0B9E713B988
for <[EMAIL PROTECTED]>; Thu, 3 May 2001 11:45:11 -0500 (CDT)
Received: from jacob by wet-pants with local (Exim 3.22 #1 (Debian))
id 14vMCt-0001AG-00; Thu, 03 May 2001 12:43:59 -0400
Subject: hp-ux patches
From: jacob berkman <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Content-Type: multipart/mixed; boundary="=-bcf71ICS2pgqWkX05+A5"
X-Mailer: Evolution/0.10 (Preview Release)
Date: 03 May 2001 12:43:59 -0400
Message-Id: <988908239.27264.2.camel@wet-pants>
Mime-Version: 1.0
--=-bcf71ICS2pgqWkX05+A5
Content-Type: text/plain
here is a collection of patches i am currently using on hp-ux. they
mostly fix problems when not using gcc, and with multi-depth visuals.
if there are any questions on these, let me know.
jacob
--
"I know if you yell 'Fire'...
but I don't know if you yell 'Godzilla.'"
-- Andy Kaufman
--=-bcf71ICS2pgqWkX05+A5
Content-Type: text/x-patch
Content-Disposition: attachment; filename=abi-hpux-hacks.patch
Content-ID: 988908213.27080.1.camel@wet-pants
Content-Transfer-Encoding: 7bit
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/util/unix/ut_dialogHelper.cpp
abisuite-0.7.14/abi/src/af/util/unix/ut_dialogHelper.cpp
*** abisuite-0.7.14.orig/abi/src/af/util/unix/ut_dialogHelper.cpp Sun Mar 25
21:05:12 2001
--- abisuite-0.7.14/abi/src/af/util/unix/ut_dialogHelper.cpp Wed May 2 15:22:32
2001
***************
*** 640,642 ****
--- 640,659 ----
#endif
}
#endif
+
+
+ GtkWidget *createDrawingArea ()
+ {
+ GtkWidget *area;
+
+ gtk_widget_push_visual (gdk_rgb_get_visual ());
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+
+ area = gtk_drawing_area_new ();
+
+ gtk_widget_pop_colormap ();
+ gtk_widget_pop_visual ();
+
+ return area;
+ }
+
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/util/unix/ut_dialogHelper.h
abisuite-0.7.14/abi/src/af/util/unix/ut_dialogHelper.h
*** abisuite-0.7.14.orig/abi/src/af/util/unix/ut_dialogHelper.h Sun Mar 25 21:03:57
2001
--- abisuite-0.7.14/abi/src/af/util/unix/ut_dialogHelper.h Wed May 2 15:08:33
2001
***************
*** 69,74 ****
--- 69,77 ----
void setDefaultButton (GnomeDialog * dlg, int which);
#endif
+ // creates a GtkDrawingArea, and pushes/pops correct visual and colormap
+ GtkWidget *createDrawingArea ();
+
#endif /* UT_DIALOGHELPER_H */
diff -Nrc -x *~
abisuite-0.7.14.orig/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp
abisuite-0.7.14/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp Sun
Mar 25 21:13:51 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/gnome/xap_UnixGnomeDlg_Zoom.cpp Wed May 2
15:15:14 2001
***************
*** 322,328 ****
// *** This is how we do a preview widget ***
{
! drawingareaPreview = gtk_drawing_area_new ();
gtk_object_set_data (GTK_OBJECT (windowZoom), "drawingareaPreview",
drawingareaPreview);
gtk_widget_show (drawingareaPreview);
gtk_container_add (GTK_CONTAINER (frameSampleText),
drawingareaPreview);
--- 322,328 ----
// *** This is how we do a preview widget ***
{
! drawingareaPreview = createDrawingArea ();
gtk_object_set_data (GTK_OBJECT (windowZoom), "drawingareaPreview",
drawingareaPreview);
gtk_widget_show (drawingareaPreview);
gtk_container_add (GTK_CONTAINER (frameSampleText),
drawingareaPreview);
diff -Nrc -x *~
abisuite-0.7.14.orig/abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp
abisuite-0.7.14/abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp
Sat Mar 17 19:02:59 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/gnome/xap_UnixGnomePrintGraphics.cpp Fri
Apr 27 14:48:17 2001
***************
*** 48,54 ****
/* map abi's fonts to gnome fonts, or at least try to */
/***********************************************************************/
! typedef struct _fontMapping
{
char *abi; // what abiword calls a font's name
char *gnome; // what gnome refers to it as (or a close substitute)
--- 48,54 ----
/* map abi's fonts to gnome fonts, or at least try to */
/***********************************************************************/
! struct _fontMapping
{
char *abi; // what abiword calls a font's name
char *gnome; // what gnome refers to it as (or a close substitute)
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixApp.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixApp.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixApp.cpp Fri Feb 9 14:32:13
2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixApp.cpp Fri Apr 27 14:50:20 2001
***************
*** 180,186 ****
{
// create a font manager for our app to use
UT_uint32 relativePathsSoFar = 0, relativePathCount = 0;
!
m_fontManager = new XAP_UnixFontManager();
UT_ASSERT(m_fontManager);
--- 180,187 ----
{
// create a font manager for our app to use
UT_uint32 relativePathsSoFar = 0, relativePathCount = 0;
! UT_uint32 i;
!
m_fontManager = new XAP_UnixFontManager();
UT_ASSERT(m_fontManager);
***************
*** 193,199 ****
(const XML_Char**)&szPrefFontPath);
UT_ASSERT((szPrefFontPath) && (*szPrefFontPath));
! for (UT_uint32 i = 0; szPrefFontPath[i]; i++)
{
// count the number of segments in the path
// path looks like: "/font/dir;dir/anotherdir;/more/fonts"
--- 194,200 ----
(const XML_Char**)&szPrefFontPath);
UT_ASSERT((szPrefFontPath) && (*szPrefFontPath));
! for (i = 0; szPrefFontPath[i]; i++)
{
// count the number of segments in the path
// path looks like: "/font/dir;dir/anotherdir;/more/fonts"
***************
*** 209,215 ****
// make pointer to the font path. ignore the cast to make gcc shut up
char *szPrefFontPathPtr = (char *)szPrefFontPath;
! for (UT_uint32 i = 0; szPrefFontPathPtr[i]; i++)
if ( ((i == 0) || (szPrefFontPathPtr[i-1] == ';')) &&
(szPrefFontPathPtr[i] != '/'))
{
// if relative path in prefs, prepend library directory.
--- 210,216 ----
// make pointer to the font path. ignore the cast to make gcc shut up
char *szPrefFontPathPtr = (char *)szPrefFontPath;
! for (i = 0; szPrefFontPathPtr[i]; i++)
if ( ((i == 0) || (szPrefFontPathPtr[i-1] == ';')) &&
(szPrefFontPathPtr[i] != '/'))
{
// if relative path in prefs, prepend library directory.
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_About.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_About.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_About.cpp Tue Feb 27
23:40:28 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_About.cpp Wed May 2 15:15:35
2001
***************
*** 231,237 ****
gtk_widget_show (hboxAbout);
gtk_container_add (GTK_CONTAINER (windowAbout), hboxAbout);
! drawingareaGraphic = gtk_drawing_area_new ();
gtk_object_set_data (GTK_OBJECT (windowAbout), "drawingareaGraphic",
drawingareaGraphic);
gtk_widget_set_events(drawingareaGraphic, GDK_EXPOSURE_MASK);
gtk_signal_connect (GTK_OBJECT(drawingareaGraphic), "expose_event",
--- 231,237 ----
gtk_widget_show (hboxAbout);
gtk_container_add (GTK_CONTAINER (windowAbout), hboxAbout);
! drawingareaGraphic = createDrawingArea ();
gtk_object_set_data (GTK_OBJECT (windowAbout), "drawingareaGraphic",
drawingareaGraphic);
gtk_widget_set_events(drawingareaGraphic, GDK_EXPOSURE_MASK);
gtk_signal_connect (GTK_OBJECT(drawingareaGraphic), "expose_event",
diff -Nrc -x *~
abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp Wed
Mar 21 23:17:44 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_FileOpenSaveAs.cpp Wed May 2
15:17:43 2001
***************
*** 491,497 ****
if (m_id == XAP_DIALOG_ID_INSERT_PICTURE)
{
! GtkWidget * preview = gtk_drawing_area_new ();
gtk_widget_show (preview);
m_preview = preview;
--- 491,497 ----
if (m_id == XAP_DIALOG_ID_INSERT_PICTURE)
{
! GtkWidget * preview = createDrawingArea ();
gtk_widget_show (preview);
m_preview = preview;
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp Tue
Feb 27 23:40:28 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp Wed May 2
15:15:58 2001
***************
*** 653,659 ****
gtk_container_border_width (GTK_CONTAINER (frame4),
PREVIEW_BOX_BORDER_WIDTH_PIXELS);
gtk_frame_set_shadow_type (GTK_FRAME (frame4), GTK_SHADOW_IN);
! entryArea = gtk_drawing_area_new ();
gtk_widget_set_events(entryArea, GDK_EXPOSURE_MASK);
gtk_signal_connect(GTK_OBJECT(entryArea), "expose_event",
GTK_SIGNAL_FUNC(s_drawing_area_expose),
NULL);
--- 653,659 ----
gtk_container_border_width (GTK_CONTAINER (frame4),
PREVIEW_BOX_BORDER_WIDTH_PIXELS);
gtk_frame_set_shadow_type (GTK_FRAME (frame4), GTK_SHADOW_IN);
! entryArea = createDrawingArea ();
gtk_widget_set_events(entryArea, GDK_EXPOSURE_MASK);
gtk_signal_connect(GTK_OBJECT(entryArea), "expose_event",
GTK_SIGNAL_FUNC(s_drawing_area_expose),
NULL);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp Tue
Feb 27 23:40:28 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp Wed May 2
15:17:00 2001
***************
*** 541,547 ****
GtkWidget *XAP_UnixDialog_Insert_Symbol::_previewNew (int w, int h)
{
! GtkWidget *pre = gtk_drawing_area_new ();
gtk_widget_show (pre);
gtk_widget_set_usize (pre, w, h);
--- 541,547 ----
GtkWidget *XAP_UnixDialog_Insert_Symbol::_previewNew (int w, int h)
{
! GtkWidget *pre = createDrawingArea ();
gtk_widget_show (pre);
gtk_widget_set_usize (pre, w, h);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_Zoom.cpp
abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_Zoom.cpp
*** abisuite-0.7.14.orig/abi/src/af/xap/unix/xap_UnixDlg_Zoom.cpp Tue Feb 27
23:40:28 2001
--- abisuite-0.7.14/abi/src/af/xap/unix/xap_UnixDlg_Zoom.cpp Wed May 2 15:17:28
2001
***************
*** 419,425 ****
// *** This is how we do a preview widget ***
{
! drawingareaPreview = gtk_drawing_area_new ();
gtk_object_set_data (GTK_OBJECT (windowZoom), "drawingareaPreview",
drawingareaPreview);
gtk_widget_show (drawingareaPreview);
gtk_container_add (GTK_CONTAINER (frameSampleText),
drawingareaPreview);
--- 419,425 ----
// *** This is how we do a preview widget ***
{
! drawingareaPreview = createDrawingArea ();
gtk_object_set_data (GTK_OBJECT (windowZoom), "drawingareaPreview",
drawingareaPreview);
gtk_widget_show (drawingareaPreview);
gtk_container_add (GTK_CONTAINER (frameSampleText),
drawingareaPreview);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/af/xap/xp/xap_Dialog_Id.h
abisuite-0.7.14/abi/src/af/xap/xp/xap_Dialog_Id.h
*** abisuite-0.7.14.orig/abi/src/af/xap/xp/xap_Dialog_Id.h Tue Mar 13 01:06:31
2001
--- abisuite-0.7.14/abi/src/af/xap/xp/xap_Dialog_Id.h Fri Apr 27 14:45:41 2001
***************
*** 30,36 ****
// (defined in ap_Types.h as the actual parameter type (this
// solves some compiler oddities)).
! typedef enum _XAP_Dialog_Id
{
XAP_DIALOG_ID__FIRST__ = 0, /* must be first */
--- 30,36 ----
// (defined in ap_Types.h as the actual parameter type (this
// solves some compiler oddities)).
! enum _XAP_Dialog_Id
{
XAP_DIALOG_ID__FIRST__ = 0, /* must be first */
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/hello/ap/unix/ap_UnixFrame.cpp
abisuite-0.7.14/abi/src/hello/ap/unix/ap_UnixFrame.cpp
*** abisuite-0.7.14.orig/abi/src/hello/ap/unix/ap_UnixFrame.cpp Tue Feb 6 17:54:29
2001
--- abisuite-0.7.14/abi/src/hello/ap/unix/ap_UnixFrame.cpp Wed May 2 15:18:04
2001
***************
*** 155,161 ****
GtkWidget* wSunkenBox = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(wSunkenBox), GTK_SHADOW_IN);
! m_dArea = gtk_drawing_area_new();
gtk_object_set_user_data(GTK_OBJECT(m_dArea), this);
gtk_signal_connect(GTK_OBJECT(m_dArea), "expose_event",
--- 155,161 ----
GtkWidget* wSunkenBox = gtk_frame_new(NULL);
gtk_frame_set_shadow_type(GTK_FRAME(wSunkenBox), GTK_SHADOW_IN);
! m_dArea = createDrawingArea();
gtk_object_set_user_data(GTK_OBJECT(m_dArea), this);
gtk_signal_connect(GTK_OBJECT(m_dArea), "expose_event",
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/hello/ap/unix/ap_UnixStatusBar.cpp
abisuite-0.7.14/abi/src/hello/ap/unix/ap_UnixStatusBar.cpp
*** abisuite-0.7.14.orig/abi/src/hello/ap/unix/ap_UnixStatusBar.cpp Fri Jul 7
19:46:51 2000
--- abisuite-0.7.14/abi/src/hello/ap/unix/ap_UnixStatusBar.cpp Wed May 2 15:26:08
2001
***************
*** 25,30 ****
--- 25,31 ----
#include "xap_UnixFrame.h"
#include "gr_UnixGraphics.h"
#include "ap_UnixStatusBar.h"
+ #include "ut_dialogHelper.h"
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
***************
*** 73,79 ****
{
UT_ASSERT(!m_pG && !m_wStatusBar);
! m_wStatusBar = gtk_drawing_area_new();
gtk_object_set_user_data(GTK_OBJECT(m_wStatusBar),this);
gtk_widget_show(m_wStatusBar);
--- 74,80 ----
{
UT_ASSERT(!m_pG && !m_wStatusBar);
! m_wStatusBar = createDrawingArea();
gtk_object_set_user_data(GTK_OBJECT(m_wStatusBar),this);
gtk_widget_show(m_wStatusBar);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/text/fmt/xp/fp_Column.cpp
abisuite-0.7.14/abi/src/text/fmt/xp/fp_Column.cpp
*** abisuite-0.7.14.orig/abi/src/text/fmt/xp/fp_Column.cpp Thu Mar 29 19:33:27
2001
--- abisuite-0.7.14/abi/src/text/fmt/xp/fp_Column.cpp Fri Apr 27 14:55:00 2001
***************
*** 463,469 ****
return dx;
}
! UT_uint32 dist = (UT_uint32) (sqrt((dx * dx) + (dy * dy)));
UT_ASSERT(dist > 0);
--- 463,469 ----
return dx;
}
! UT_uint32 dist = (UT_uint32) (sqrt((float)(dx * dx) + (dy * dy)));
UT_ASSERT(dist > 0);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixApp.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixApp.cpp Wed Mar 28 15:34:26
2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixApp.cpp Wed May 2 15:20:58 2001
***************
*** 975,981 ****
gtk_widget_show(frame);
// create a drawing area
! GtkWidget * da = gtk_drawing_area_new ();
gtk_widget_set_events(da, GDK_ALL_EVENTS_MASK);
gtk_drawing_area_size(GTK_DRAWING_AREA (da), iSplashWidth, iSplashHeight);
gtk_signal_connect(GTK_OBJECT(da), "expose_event",
--- 975,982 ----
gtk_widget_show(frame);
// create a drawing area
! GtkWidget * da = createDrawingArea ();
!
gtk_widget_set_events(da, GDK_ALL_EVENTS_MASK);
gtk_drawing_area_size(GTK_DRAWING_AREA (da), iSplashWidth, iSplashHeight);
gtk_signal_connect(GTK_OBJECT(da), "expose_event",
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp Wed Mar 28
15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Columns.cpp Wed May 2
15:18:38 2001
***************
*** 434,440 ****
gtk_container_set_border_width (GTK_CONTAINER (wDrawFrame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (wDrawFrame), GTK_SHADOW_OUT);
! wPreviewArea = gtk_drawing_area_new ();
gtk_widget_ref (wPreviewArea);
gtk_object_set_data_full (GTK_OBJECT (windowColumns), "wPreviewArea",
wPreviewArea,
(GtkDestroyNotify)
gtk_widget_unref);
--- 434,440 ----
gtk_container_set_border_width (GTK_CONTAINER (wDrawFrame), 4);
gtk_frame_set_shadow_type (GTK_FRAME (wDrawFrame), GTK_SHADOW_OUT);
! wPreviewArea = createDrawingArea ();
gtk_widget_ref (wPreviewArea);
gtk_object_set_data_full (GTK_OBJECT (windowColumns), "wPreviewArea",
wPreviewArea,
(GtkDestroyNotify)
gtk_widget_unref);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp Fri Mar 30
01:33:23 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Lists.cpp Wed May 2 15:18:47
2001
***************
*** 784,790 ****
gtk_container_set_border_width (GTK_CONTAINER (preview_frame), 3);
gtk_frame_set_shadow_type (GTK_FRAME (preview_frame), GTK_SHADOW_IN);
! preview_area = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA(preview_area),180,225);
// gtk_widget_set_usize(preview_area, 180, 225);
gtk_widget_show (preview_area);
--- 784,790 ----
gtk_container_set_border_width (GTK_CONTAINER (preview_frame), 3);
gtk_frame_set_shadow_type (GTK_FRAME (preview_frame), GTK_SHADOW_IN);
! preview_area = createDrawingArea ();
gtk_drawing_area_size (GTK_DRAWING_AREA(preview_area),180,225);
// gtk_widget_set_usize(preview_area, 180, 225);
gtk_widget_show (preview_area);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_PageNumbers.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_PageNumbers.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_PageNumbers.cpp Wed
Mar 28 15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_PageNumbers.cpp Wed May 2
15:18:58 2001
***************
*** 348,354 ****
gtk_box_pack_start (GTK_BOX (hbox1), frame1, TRUE, TRUE, 0);
// create the preview area
! m_previewArea = gtk_drawing_area_new ();
gtk_drawing_area_size (GTK_DRAWING_AREA(m_previewArea), 90, 115);
gtk_widget_show (m_previewArea);
gtk_container_add (GTK_CONTAINER (frame1), m_previewArea);
--- 348,354 ----
gtk_box_pack_start (GTK_BOX (hbox1), frame1, TRUE, TRUE, 0);
// create the preview area
! m_previewArea = createDrawingArea ();
gtk_drawing_area_size (GTK_DRAWING_AREA(m_previewArea), 90, 115);
gtk_widget_show (m_previewArea);
gtk_container_add (GTK_CONTAINER (frame1), m_previewArea);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp Wed Mar 28
15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_PageSetup.cpp Fri Apr 27
15:05:57 2001
***************
*** 136,141 ****
--- 136,144 ----
// a *huge* convenience macro
static char _ev_buf[256];
+ #ifdef _
+ #undef _
+ #endif
#define _(a, x) _ev_convert (_ev_buf, pSS->getValue (a##_STRING_ID_##x))
// string tags to stuff stored in widget data
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp Wed Mar 28
15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Paragraph.cpp Wed May 2
15:19:38 2001
***************
*** 1097,1103 ****
gtk_widget_set_usize (framePreview, 400, 150);
gtk_frame_set_shadow_type (GTK_FRAME (framePreview), GTK_SHADOW_NONE);
! drawingareaPreview = gtk_drawing_area_new ();
gtk_widget_ref (drawingareaPreview);
gtk_object_set_data_full (GTK_OBJECT (windowMain), "drawingareaPreview",
drawingareaPreview,
(GtkDestroyNotify)
gtk_widget_unref);
--- 1097,1103 ----
gtk_widget_set_usize (framePreview, 400, 150);
gtk_frame_set_shadow_type (GTK_FRAME (framePreview), GTK_SHADOW_NONE);
! drawingareaPreview = createDrawingArea ();
gtk_widget_ref (drawingareaPreview);
gtk_object_set_data_full (GTK_OBJECT (windowMain), "drawingareaPreview",
drawingareaPreview,
(GtkDestroyNotify)
gtk_widget_unref);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp Wed Mar 28
21:05:03 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp Wed May 2 15:19:56
2001
***************
*** 480,486 ****
frameParaPrev = gtk_frame_new(
pSS->getValue(AP_STRING_ID_DLG_Styles_ParaPrev));
! ParaPreviewArea = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(ParaPreviewArea), 300, 60);
gtk_container_add(GTK_CONTAINER(frameParaPrev), ParaPreviewArea);
--- 480,486 ----
frameParaPrev = gtk_frame_new(
pSS->getValue(AP_STRING_ID_DLG_Styles_ParaPrev));
! ParaPreviewArea = createDrawingArea();
gtk_drawing_area_size(GTK_DRAWING_AREA(ParaPreviewArea), 300, 60);
gtk_container_add(GTK_CONTAINER(frameParaPrev), ParaPreviewArea);
***************
*** 490,496 ****
frameCharPrev = gtk_frame_new(
pSS->getValue(AP_STRING_ID_DLG_Styles_CharPrev));
! CharPreviewArea = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(CharPreviewArea), 300, 60);
gtk_container_add(GTK_CONTAINER(frameCharPrev), CharPreviewArea);
--- 490,496 ----
frameCharPrev = gtk_frame_new(
pSS->getValue(AP_STRING_ID_DLG_Styles_CharPrev));
! CharPreviewArea = createDrawingArea();
gtk_drawing_area_size(GTK_DRAWING_AREA(CharPreviewArea), 300, 60);
gtk_container_add(GTK_CONTAINER(frameCharPrev), CharPreviewArea);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixFrame.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixFrame.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixFrame.cpp Wed Mar 28 15:34:26
2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixFrame.cpp Wed May 2 15:20:18 2001
***************
*** 95,101 ****
UT_uint32 point = 0;
gboolean bFocus;
XAP_UnixFontManager * fontManager = ((XAP_UnixApp *)
getApp())->getFontManager();
!
pG = new GR_UnixGraphics(m_dArea->window, fontManager, getApp());
ENSUREP(pG);
pG->setZoomPercentage(iZoom);
--- 95,102 ----
UT_uint32 point = 0;
gboolean bFocus;
XAP_UnixFontManager * fontManager = ((XAP_UnixApp *)
getApp())->getFontManager();
! UT_uint32 k;
!
pG = new GR_UnixGraphics(m_dArea->window, fontManager, getApp());
ENSUREP(pG);
pG->setZoomPercentage(iZoom);
***************
*** 155,161 ****
goto Cleanup;
nrToolbars = m_vecToolbarLayoutNames.getItemCount();
! for (UT_uint32 k=0; k < nrToolbars; k++)
{
// TODO Toolbars are a frame-level item, but a view-listener is
// TODO a view-level item. I've bound the toolbar-view-listeners
--- 156,162 ----
goto Cleanup;
nrToolbars = m_vecToolbarLayoutNames.getItemCount();
! for (k=0; k < nrToolbars; k++)
{
// TODO Toolbars are a frame-level item, but a view-listener is
// TODO a view-level item. I've bound the toolbar-view-listeners
***************
*** 643,649 ****
GTK_WIDGET_UNSET_FLAGS(m_vScroll, GTK_CAN_FOCUS);
// create a drawing area in the for our document window.
! m_dArea = gtk_drawing_area_new();
gtk_object_set_user_data(GTK_OBJECT(m_dArea),this);
gtk_widget_set_events(GTK_WIDGET(m_dArea), (GDK_EXPOSURE_MASK |
--- 644,650 ----
GTK_WIDGET_UNSET_FLAGS(m_vScroll, GTK_CAN_FOCUS);
// create a drawing area in the for our document window.
! m_dArea = createDrawingArea();
gtk_object_set_user_data(GTK_OBJECT(m_dArea),this);
gtk_widget_set_events(GTK_WIDGET(m_dArea), (GDK_EXPOSURE_MASK |
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixLeftRuler.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixLeftRuler.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixLeftRuler.cpp Wed Mar 28
15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixLeftRuler.cpp Wed May 2 15:24:51
2001
***************
*** 25,30 ****
--- 25,31 ----
#include "xap_UnixFrame.h"
#include "ap_UnixLeftRuler.h"
#include "gr_UnixGraphics.h"
+ #include "ut_dialogHelper.h"
#define ENSUREP(p) do { UT_ASSERT(p); if (!p) goto Cleanup; } while (0)
***************
*** 50,57 ****
GtkWidget * AP_UnixLeftRuler::createWidget(void)
{
UT_ASSERT(!m_pG && !m_wLeftRuler);
!
! m_wLeftRuler = gtk_drawing_area_new();
gtk_object_set_user_data(GTK_OBJECT(m_wLeftRuler),this);
gtk_widget_show(m_wLeftRuler);
--- 51,58 ----
GtkWidget * AP_UnixLeftRuler::createWidget(void)
{
UT_ASSERT(!m_pG && !m_wLeftRuler);
!
! m_wLeftRuler = createDrawingArea();
gtk_object_set_user_data(GTK_OBJECT(m_wLeftRuler),this);
gtk_widget_show(m_wLeftRuler);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixStatusBar.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixStatusBar.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixStatusBar.cpp Wed Mar 28
15:34:26 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixStatusBar.cpp Wed May 2 15:28:02
2001
***************
*** 25,30 ****
--- 25,31 ----
#include "xap_UnixFrame.h"
#include "gr_UnixGraphics.h"
#include "ap_UnixStatusBar.h"
+ #include "ut_dialogHelper.h"
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
***************
*** 73,79 ****
{
UT_ASSERT(!m_pG && !m_wStatusBar);
! m_wStatusBar = gtk_drawing_area_new();
gtk_object_set_user_data(GTK_OBJECT(m_wStatusBar),this);
gtk_widget_show(m_wStatusBar);
--- 74,80 ----
{
UT_ASSERT(!m_pG && !m_wStatusBar);
! m_wStatusBar = createDrawingArea();
gtk_object_set_user_data(GTK_OBJECT(m_wStatusBar),this);
gtk_widget_show(m_wStatusBar);
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixTopRuler.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixTopRuler.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/ap_UnixTopRuler.cpp Wed Mar 28 15:34:26
2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/ap_UnixTopRuler.cpp Wed May 2 15:21:27
2001
***************
*** 84,91 ****
GtkWidget * AP_UnixTopRuler::createWidget(void)
{
UT_ASSERT(!m_pG && !m_wTopRuler);
!
! m_wTopRuler = gtk_drawing_area_new();
//UT_DEBUGMSG(("AP_UnixTopRuler::createWidget - [w=%p] [this=%p]\n",
m_wTopRuler,this));
--- 84,91 ----
GtkWidget * AP_UnixTopRuler::createWidget(void)
{
UT_ASSERT(!m_pG && !m_wTopRuler);
!
! m_wTopRuler = createDrawingArea();
//UT_DEBUGMSG(("AP_UnixTopRuler::createWidget - [w=%p] [this=%p]\n",
m_wTopRuler,this));
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp
abisuite-0.7.14/abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp
*** abisuite-0.7.14.orig/abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp Tue Mar 27
23:31:18 2001
--- abisuite-0.7.14/abi/src/wp/ap/unix/gnome/ap_UnixGnomeApp.cpp Fri Apr 27
14:59:10 2001
***************
*** 108,113 ****
--- 108,114 ----
int AP_UnixGnomeApp::main(const char * szAppName, int argc, char ** argv)
{
+ int k;
// This is a static function.
UT_DEBUGMSG(("Build ID:\t%s\n", XAP_App::s_szBuild_ID));
***************
*** 126,132 ****
// Do a quick and dirty find for "--to"
bool bShowSplash = true;
bool bShowApp = true;
! for (int k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if ((UT_stricmp(Args.m_argv[k],"--to") == 0) ||
(UT_stricmp(Args.m_argv[k],"-t") == 0))
--- 127,133 ----
// Do a quick and dirty find for "--to"
bool bShowSplash = true;
bool bShowApp = true;
! for (k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if ((UT_stricmp(Args.m_argv[k],"--to") == 0) ||
(UT_stricmp(Args.m_argv[k],"-t") == 0))
***************
*** 137,143 ****
}
// Do a quick and dirty find for "--show"
! for (int k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if (UT_stricmp(Args.m_argv[k],"--show") == 0)
{
--- 138,144 ----
}
// Do a quick and dirty find for "--show"
! for (k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if (UT_stricmp(Args.m_argv[k],"--show") == 0)
{
***************
*** 147,153 ****
}
// Do a quick and dirty find for "--nosplash"
! for (int k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if ((UT_stricmp(Args.m_argv[k],"--nosplash") == 0) ||
(UT_stricmp(Args.m_argv[k], "-n") == 0))
--- 148,154 ----
}
// Do a quick and dirty find for "--nosplash"
! for (k = 1; k < Args.m_argc; k++)
if (*Args.m_argv[k] == '-')
if ((UT_stricmp(Args.m_argv[k],"--nosplash") == 0) ||
(UT_stricmp(Args.m_argv[k], "-n") == 0))
diff -Nrc -x *~ abisuite-0.7.14.orig/abi/src/wp/ap/xp/ap_Dialog_Id.h
abisuite-0.7.14/abi/src/wp/ap/xp/ap_Dialog_Id.h
*** abisuite-0.7.14.orig/abi/src/wp/ap/xp/ap_Dialog_Id.h Wed Mar 28 15:34:23
2001
--- abisuite-0.7.14/abi/src/wp/ap/xp/ap_Dialog_Id.h Fri Apr 27 14:56:22 2001
***************
*** 25,31 ****
#include "xap_Dialog_Id.h"
! typedef enum _AP_Dialog_Id
{
AP_DIALOG_ID__FIRST__ = XAP_DIALOG_ID__LAST__+1, /*
must be first */
--- 25,31 ----
#include "xap_Dialog_Id.h"
! enum _AP_Dialog_Id
{
AP_DIALOG_ID__FIRST__ = XAP_DIALOG_ID__LAST__+1, /*
must be first */
--=-bcf71ICS2pgqWkX05+A5--
PGP signature