Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final GCC 4 fixes by Ingo Weinhold (were not visible before, due to a missing -no-undefined). 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14918 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-11-14 16:08:59 +00:00
parent 02e5c93fd6
commit 4a71b881a9
4 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/apps/deskbar/BarWindow.cpp
View File

@ -57,12 +57,15 @@ All rights reserved.
// method from the TBarWindow::ShowBeMenu() method.
// Don't do this at home -- but why the hell is this method private?
#if __MWERKS__
extern "C" void StartMenuBar__8BMenuBarFlbbP5BRect(BMenuBar *,int32,bool,bool,BRect *);
#elif __GCC__ <= 2
extern "C" void StartMenuBar__8BMenuBarlbT2P5BRect(BMenuBar *,int32,bool,bool,BRect *);
#define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarFlbbP5BRect
#elif __GNUC__ <= 2
#define BMenuBar_StartMenuBar_Hack StartMenuBar__8BMenuBarlbT2P5BRect
#elif __GNUC__ > 2
#define BMenuBar_StartMenuBar_Hack _ZN8BMenuBar12StartMenuBarElbbP5BRect
#else
# error "You may want to port this ugly hack to your compiler ABI"
#endif
extern "C" void BMenuBar_StartMenuBar_Hack(BMenuBar *,int32,bool,bool,BRect *);
TBeMenu *TBarWindow::sBeMenu = NULL;
@ -280,11 +283,7 @@ TBarWindow::ShowBeMenu()
if (menuBar == NULL)
return;
#if __MWERKS__
StartMenuBar__8BMenuBarFlbbP5BRect(menuBar,0,true,true,NULL);
#elif __GCC__ <= 2
StartMenuBar__8BMenuBarlbT2P5BRect(menuBar,0,true,true,NULL);
#endif
BMenuBar_StartMenuBar_Hack(menuBar,0,true,true,NULL);
}
@ -298,11 +297,7 @@ TBarWindow::ShowTeamMenu()
if (KeyMenuBar() == NULL)
return;
#if __MWERKS__
StartMenuBar__8BMenuBarFlbbP5BRect(KeyMenuBar(),index,true,true,NULL);
#elif __GCC__ <= 2
StartMenuBar__8BMenuBarlbT2P5BRect(KeyMenuBar(),index,true,true,NULL);
#endif
BMenuBar_StartMenuBar_Hack(KeyMenuBar(),index,true,true,NULL);
}

2
src/kits/tracker/FBCPadding.cpp
View File

@ -95,7 +95,7 @@ void BFilePanel::_ReservedFilePanel8() {}
// deprecated cruft
#if __GNUC__ || __MWERKS__
#if __GNUC__ && __GNUC__ < 3 || __MWERKS__
extern "C" {
_EXPORT BFilePanel*

14
src/kits/tracker/PoseView.cpp
View File

@ -2761,20 +2761,6 @@ BPoseView::MapToNewIconMode(BPose *pose, BPoint oldGrid, BPoint oldOffset)
}
inline bool
BPoseView::HasPosesInClipboard()
{
return fHasPosesInClipboard;
}
inline void
BPoseView::SetHasPosesInClipboard(bool hasPoses)
{
fHasPosesInClipboard = hasPoses;
}
void
BPoseView::SetPosesClipboardMode(uint32 clipboardMode)
{

18
src/kits/tracker/PoseView.h
View File

@ -303,8 +303,8 @@ class BPoseView : public BView {
void PlaceFolder(const entry_ref *, const BMessage *);
// clipboard handling for poses
bool HasPosesInClipboard();
void SetHasPosesInClipboard(bool hasPoses);
inline bool HasPosesInClipboard();
inline void SetHasPosesInClipboard(bool hasPoses);
void SetPosesClipboardMode(uint32 clipboardMode);
void UpdatePosesClipboardModeFromClipboard(BMessage *clipboardReport = NULL);
@ -1001,6 +1001,20 @@ BPoseView::FindPose(const entry_ref *entry, int32 *index) const
}
inline bool
BPoseView::HasPosesInClipboard()
{
return fHasPosesInClipboard;
}
inline void
BPoseView::SetHasPosesInClipboard(bool hasPoses)
{
fHasPosesInClipboard = hasPoses;
}
template<class Param1>
void
EachTextWidget(BPose *pose, BPoseView *poseView,