According to Hubert Figuiere <[EMAIL PROTECTED]>:
> Here is a patch the clean up the XAP dialog code.
It's better when you send the patch with your email :=)
Hub
Index: src/af/xap/xp/xap_Dialog.h
===================================================================
RCS file: /u2/cvsroot/abi/src/af/xap/xp/xap_Dialog.h,v
retrieving revision 1.14
diff -c -r1.14 xap_Dialog.h
*** src/af/xap/xp/xap_Dialog.h 2000/07/03 19:58:03 1.14
--- src/af/xap/xp/xap_Dialog.h 2000/07/07 06:45:11
***************
*** 136,144 ****
virtual void runModeless(XAP_Frame * pFrame) = 0;
virtual void setActiveFrame(XAP_Frame *pFrame);
! // not pure functions. Unix doesn't need to implement these functions
! virtual void notifyActiveFrame(XAP_Frame *pFrame) {}
! virtual void notifyCloseFrame(XAP_Frame *pFrame) {}
virtual void destroy(void) = 0;
virtual void activate(void) = 0;
--- 136,144 ----
virtual void runModeless(XAP_Frame * pFrame) = 0;
virtual void setActiveFrame(XAP_Frame *pFrame);
! // virtual pure functions. Do an empty implementation if you don't need it.
! virtual void notifyActiveFrame(XAP_Frame *pFrame) =
0;
! virtual void notifyCloseFrame(XAP_Frame *pFrame) =
0;
virtual void destroy(void) = 0;
virtual void activate(void) = 0;
Index: src/wp/ap/unix/ap_UnixDialog_Goto.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Goto.h,v
retrieving revision 1.8
diff -c -r1.8 ap_UnixDialog_Goto.h
*** src/wp/ap/unix/ap_UnixDialog_Goto.h 2000/07/06 23:42:07 1.8
--- src/wp/ap/unix/ap_UnixDialog_Goto.h 2000/07/07 06:45:11
***************
*** 32,38 ****
virtual ~AP_UnixDialog_Goto(void);
static XAP_Dialog * static_constructor(XAP_DialogFactory *,
XAP_Dialog_Id id);
!
virtual void runModeless(XAP_Frame * pFrame);
virtual void destroy(void);
virtual void activate(void);
--- 32,38 ----
virtual ~AP_UnixDialog_Goto(void);
static XAP_Dialog * static_constructor(XAP_DialogFactory *,
XAP_Dialog_Id id);
! virtual void notifyCloseFrame(XAP_Frame *) {};
virtual void runModeless(XAP_Frame * pFrame);
virtual void destroy(void);
virtual void activate(void);
Index: src/wp/ap/unix/ap_UnixDialog_WordCount.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_WordCount.h,v
retrieving revision 1.6
diff -c -r1.6 ap_UnixDialog_WordCount.h
*** src/wp/ap/unix/ap_UnixDialog_WordCount.h 2000/06/06 06:10:04 1.6
--- src/wp/ap/unix/ap_UnixDialog_WordCount.h 2000/07/07 06:45:11
***************
*** 37,42 ****
--- 37,43 ----
virtual void destroy(void);
virtual void activate(void);
virtual void notifyActiveFrame(XAP_Frame *pFrame);
+ virtual void notifyCloseFrame(XAP_Frame *) {};
static XAP_Dialog * static_constructor(XAP_DialogFactory *,
XAP_Dialog_Id id);
static void autoupdateWC(UT_Timer * pTimer);
Index: src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Goto.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Goto.h,v
retrieving revision 1.2
diff -c -r1.2 ap_UnixGnomeDialog_Goto.h
*** src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Goto.h 2000/06/09 21:07:11 1.2
--- src/wp/ap/unix/gnome/ap_UnixGnomeDialog_Goto.h 2000/07/07 06:45:11
***************
*** 31,36 ****
--- 31,38 ----
virtual ~AP_UnixGnomeDialog_Goto(void);
static XAP_Dialog * static_constructor(XAP_DialogFactory *,
XAP_Dialog_Id id);
+ // unneeded
+ void notifyCloseFrame(XAP_Frame *) {};
protected:
virtual GtkWidget * _constructWindow (void);
Index: src/wp/ap/unix/gnome/ap_UnixGnomeDialog_WordCount.h
===================================================================
RCS file: /u2/cvsroot/abi/src/wp/ap/unix/gnome/ap_UnixGnomeDialog_WordCount.h,v
retrieving revision 1.2
diff -c -r1.2 ap_UnixGnomeDialog_WordCount.h
*** src/wp/ap/unix/gnome/ap_UnixGnomeDialog_WordCount.h 2000/05/27 16:20:42 1.2
--- src/wp/ap/unix/gnome/ap_UnixGnomeDialog_WordCount.h 2000/07/07 06:45:11
***************
*** 34,39 ****
--- 34,41 ----
static XAP_Dialog * static_constructor(XAP_DialogFactory *,
XAP_Dialog_Id id);
+ void notifyCloseFrame(XAP_Frame *) {};
+
protected:
// private construction functions
virtual GtkWidget * _constructWindow(void);
