Hello,
2 patches for BeOS :
- the first one modifies BeOS only files. It does some cleanups in
header files
and fixes the push buttons (not enabled by default)
- the second one modifies pt_PT_DeleteStrux.cpp. gcc on BeOS was
reporting an error about const arguments being passed temporary (I
don't
remember exactly the message). Anyway I can't figure why this patch is
not
needed on other platforms (especially those using gcc). Could you
please review
this (3-lines) patch ?
Stephane
Index: src/af/ev/beos/ev_BeOSKeyboard.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/ev/beos/ev_BeOSKeyboard.cpp,v
retrieving revision 1.5
diff -u -r1.5 ev_BeOSKeyboard.cpp
--- src/af/ev/beos/ev_BeOSKeyboard.cpp 2001/02/06 22:53:50 1.5
+++ src/af/ev/beos/ev_BeOSKeyboard.cpp 2001/08/22 21:30:43
@@ -17,6 +17,8 @@
* 02111-1307, USA.
*/
+#include <MessageFilter.h>
+
#include "ut_types.h"
#include "ut_assert.h"
#include "ut_string.h"
Index: src/af/ev/beos/ev_BeOSToolbar.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/ev/beos/ev_BeOSToolbar.cpp,v
retrieving revision 1.19
diff -u -r1.19 ev_BeOSToolbar.cpp
--- src/af/ev/beos/ev_BeOSToolbar.cpp 2001/05/01 01:20:58 1.19
+++ src/af/ev/beos/ev_BeOSToolbar.cpp 2001/08/22 21:30:45
@@ -499,6 +499,7 @@
items[item_count].rect.top = ITEM_SEPERATE;
items[item_count].rect.bottom = ITEM_SEPERATE + ITEM_HEIGHT;
items[item_count].rect.left = ITEM_SEPERATE;
+ items[item_count].state = ENABLED_MASK;
if (item_count != 0)
items[item_count].rect.left += items[item_count-1].rect.right;
@@ -857,4 +858,4 @@
}
}
mouseDownItemNo=-1;
-}
\ No newline at end of file
+}
Index: src/af/gr/beos/gr_BeOSGraphics.h
===================================================================
RCS file: /cvsroot/abi/src/af/gr/beos/gr_BeOSGraphics.h,v
retrieving revision 1.20
diff -u -r1.20 gr_BeOSGraphics.h
--- src/af/gr/beos/gr_BeOSGraphics.h 2001/06/12 01:57:24 1.20
+++ src/af/gr/beos/gr_BeOSGraphics.h 2001/08/22 21:30:46
@@ -20,9 +20,10 @@
#ifndef GR_BEOSGRAPHICS_H
#define GR_BEOSGRAPHICS_H
+#include <GraphicsDefs.h>
+#include <Point.h>
#include "gr_Graphics.h"
#include "ut_assert.h"
-#include <Be.h>
//#define USE_BACKING_BITMAP 1
Index: src/af/util/beos/ut_Rehydrate.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/util/beos/ut_Rehydrate.cpp,v
retrieving revision 1.1
diff -u -r1.1 ut_Rehydrate.cpp
--- src/af/util/beos/ut_Rehydrate.cpp 1999/05/30 23:57:19 1.1
+++ src/af/util/beos/ut_Rehydrate.cpp 2001/08/22 21:30:46
@@ -1,7 +1,11 @@
#include "ut_Rehydrate.h"
#include <stdio.h>
-#include <Be.h>
+#include <Application.h>
+#include <Roster.h>
+#include <File.h>
+#include <Resources.h>
+#include <AppFileInfo.h>
bool RehydrateWindow(char *name, BMessage *tempMsg) {
BResources res;
Index: src/af/xap/beos/xap_BeOSApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSApp.cpp,v
retrieving revision 1.9
diff -u -r1.9 xap_BeOSApp.cpp
--- src/af/xap/beos/xap_BeOSApp.cpp 2001/02/06 22:54:13 1.9
+++ src/af/xap/beos/xap_BeOSApp.cpp 2001/08/22 21:30:47
@@ -20,6 +20,10 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include <Path.h>
+#include <Mime.h>
+#include <Roster.h>
+#include <AppFileInfo.h>
#include "xap_Args.h"
#include "xap_BeOSApp.h"
#include "xap_FakeClipboard.h"
Index: src/af/xap/beos/xap_BeOSApp.h
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSApp.h,v
retrieving revision 1.13
diff -u -r1.13 xap_BeOSApp.h
--- src/af/xap/beos/xap_BeOSApp.h 2001/07/17 21:48:09 1.13
+++ src/af/xap/beos/xap_BeOSApp.h 2001/08/22 21:30:48
@@ -21,7 +21,7 @@
#ifndef XAP_BEOSAPP_H
#define XAP_BEOSAPP_H
-#include <Be.h>
+#include <Application.h>
#include "xap_App.h"
#include "xap_BeOSDialogFactory.h"
Index: src/af/xap/beos/xap_BeOSDlg_About.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSDlg_About.cpp,v
retrieving revision 1.6
diff -u -r1.6 xap_BeOSDlg_About.cpp
--- src/af/xap/beos/xap_BeOSDlg_About.cpp 2000/08/16 22:52:03 1.6
+++ src/af/xap/beos/xap_BeOSDlg_About.cpp 2001/08/22 21:30:48
@@ -19,12 +19,13 @@
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#include <Window.h>
+#include <TranslationUtils.h>
#include "ut_string.h"
#include "ut_assert.h"
#include "ut_debugmsg.h"
-// #include "ut_dialogHelper.h"
#include "ut_Rehydrate.h"
-#include <Be.h>
#include "xap_App.h"
#include "xap_Dialog_Id.h"
Index: src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp,v
retrieving revision 1.11
diff -u -r1.11 xap_BeOSDlg_FileOpenSaveAs.cpp
--- src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp 2001/02/06 22:54:13 1.11
+++ src/af/xap/beos/xap_BeOSDlg_FileOpenSaveAs.cpp 2001/08/22 21:30:49
@@ -22,6 +22,10 @@
#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <Entry.h>
+#include <Path.h>
+#include <Directory.h>
+#include <FilePanel.h>
#include "ut_string.h"
#include "ut_assert.h"
#include "xap_Dialog_Id.h"
Index: src/af/xap/beos/xap_BeOSFrame.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSFrame.cpp,v
retrieving revision 1.30
diff -u -r1.30 xap_BeOSFrame.cpp
--- src/af/xap/beos/xap_BeOSFrame.cpp 2001/05/01 01:21:04 1.30
+++ src/af/xap/beos/xap_BeOSFrame.cpp 2001/08/22 21:30:51
@@ -19,6 +19,7 @@
#include <stdio.h>
#include <string.h>
+#include <Roster.h>
#include "ut_types.h"
#include "ut_string.h"
#include "ut_debugmsg.h"
Index: src/af/xap/beos/xap_BeOSToolbar_Icons.h
===================================================================
RCS file: /cvsroot/abi/src/af/xap/beos/xap_BeOSToolbar_Icons.h,v
retrieving revision 1.2
diff -u -r1.2 xap_BeOSToolbar_Icons.h
--- src/af/xap/beos/xap_BeOSToolbar_Icons.h 1999/05/01 08:45:39 1.2
+++ src/af/xap/beos/xap_BeOSToolbar_Icons.h 2001/08/22 21:30:51
@@ -23,7 +23,6 @@
#include "ut_types.h"
#include "xap_Toolbar_Icons.h"
-#include <Be.h>
/*****************************************************************/
class AP_BeOSToolbar_Icons : public AP_Toolbar_Icons
Index: src/wp/ap/beos/ap_BeOSApp.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/beos/ap_BeOSApp.cpp,v
retrieving revision 1.46
diff -u -r1.46 ap_BeOSApp.cpp
--- src/wp/ap/beos/ap_BeOSApp.cpp 2001/08/03 09:40:13 1.46
+++ src/wp/ap/beos/ap_BeOSApp.cpp 2001/08/22 21:31:01
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <sys/stat.h>
#include "ut_debugmsg.h"
Index: src/wp/ap/beos/ap_BeOSTopRuler.cpp
===================================================================
RCS file: /cvsroot/abi/src/wp/ap/beos/ap_BeOSTopRuler.cpp,v
retrieving revision 1.11
diff -u -r1.11 ap_BeOSTopRuler.cpp
--- src/wp/ap/beos/ap_BeOSTopRuler.cpp 2001/03/05 02:16:01 1.11
+++ src/wp/ap/beos/ap_BeOSTopRuler.cpp 2001/08/22 21:31:03
@@ -17,6 +17,7 @@
* 02111-1307, USA.
*/
+#include <MessageFilter.h>
#include "ut_types.h"
#include "ut_assert.h"
#include "ut_debugmsg.h"
BeOS Attributes
Index: src/text/ptbl/xp/pt_PT_DeleteStrux.cpp
===================================================================
RCS file: /cvsroot/abi/src/text/ptbl/xp/pt_PT_DeleteStrux.cpp,v
retrieving revision 1.26
diff -u -r1.26 pt_PT_DeleteStrux.cpp
--- src/text/ptbl/xp/pt_PT_DeleteStrux.cpp 2001/08/08 08:10:15 1.26
+++ src/text/ptbl/xp/pt_PT_DeleteStrux.cpp 2001/08/22 21:30:59
@@ -260,9 +260,9 @@
PT_AttrPropIndex indexAP = pfStruxSec->getIndexAP();
const PP_AttrProp * pAP = NULL;
getAttrProp(indexAP, &pAP);
- const char * szHeaderV = NULL;
+ const XML_Char * szHeaderV = NULL;
bool bres = pAP->getAttribute("header",szHeaderV);
- const char * szFooterV = NULL;
+ const XML_Char * szFooterV = NULL;
bres = bres & pAP->getAttribute("footer",szFooterV);
pf_Frag * curFrag = NULL;
UT_DEBUGMSG(("SEVIOR: Deleting HdrFtrs from Document, headerID = %s footerID =
%s \n",szHeaderV,szFooterV));
@@ -296,7 +296,7 @@
PT_AttrPropIndex indexAPHdr = curStrux->getIndexAP();
const PP_AttrProp * pAPHdr = NULL;
getAttrProp(indexAPHdr, &pAPHdr);
- const char * szID = NULL;
+ const XML_Char * szID = NULL;
bres = pAPHdr->getAttribute("id",szID);
UT_DEBUGMSG(("SEVIOR: Found candidate id = %s
\n",szID));
if(bres && (szID != NULL))
@@ -342,7 +342,7 @@
PT_AttrPropIndex indexAPHdr = curStrux->getIndexAP();
const PP_AttrProp * pAPHdr = NULL;
getAttrProp(indexAPHdr, &pAPHdr);
- const char * szID = NULL;
+ const XML_Char * szID = NULL;
bres = pAPHdr->getAttribute("id",szID);
UT_DEBUGMSG(("SEVIOR: Found a footer candidate id = %s
\n",szID));
if(bres && (szID != NULL))
BeOS Attributes
