* fix wrong cast
* fix r5 target build git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28268 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
5b89d754a5
commit
9a321797d9
@ -21,9 +21,11 @@ public:
|
||||
BMessage *msg, int32 min, int32 max, thumb_style t);
|
||||
|
||||
virtual ~JSDSlider();
|
||||
|
||||
#ifdef __HAIKU__
|
||||
virtual const char* UpdateText() const;
|
||||
|
||||
#else
|
||||
virtual char* UpdateText() const;
|
||||
#endif
|
||||
private:
|
||||
mutable BString fResult;
|
||||
};
|
||||
|
@ -81,7 +81,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings)
|
||||
if (settings->FindBool("create_xrefs", &fCreateXRefs) != B_OK)
|
||||
fCreateXRefs = false;
|
||||
|
||||
if (settings->FindInt32("close_option", (int32)&fCloseOption) != B_OK)
|
||||
if (settings->FindInt32("close_option", (int32*)&fCloseOption) != B_OK)
|
||||
fCloseOption = kNever;
|
||||
|
||||
BRect bounds(Bounds());
|
||||
|
@ -26,7 +26,10 @@ JSDSlider::~JSDSlider()
|
||||
}
|
||||
|
||||
|
||||
const char*
|
||||
#ifdef __HAIKU__
|
||||
const
|
||||
#endif
|
||||
char*
|
||||
JSDSlider::UpdateText() const
|
||||
{
|
||||
// When the slider's Draw method is called, this method will also be called.
|
||||
@ -46,5 +49,9 @@ JSDSlider::UpdateText() const
|
||||
}
|
||||
|
||||
fResult.SetTo(string);
|
||||
#ifdef __HAIKU__
|
||||
return fResult.String();
|
||||
#else
|
||||
return const_cast<char*>(fResult.String());
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user