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

* fix wrong cast

Browse Source 
* 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:
Karsten Heimrich 2008-10-21 20:21:16 +00:00
parent 5b89d754a5
commit 9a321797d9
3 changed files with 13 additions and 4 deletions
headers/libs/print/libprint
JSDSlider.h
src
add-ons/print/drivers/pdf/source
AdvancedSettingsWindow.cpp
libs/print/libprint
JSDSlider.cpp

6
headers/libs/print/libprint/JSDSlider.h

@ -21,9 +21,11 @@ public:
BMessage *msg, int32 min, int32 max, thumb_style t); BMessage *msg, int32 min, int32 max, thumb_style t);
virtual ~JSDSlider(); virtual ~JSDSlider();
#ifdef __HAIKU__
virtual const char* UpdateText() const; virtual const char* UpdateText() const;
#else
virtual char* UpdateText() const;
#endif
private: private:
mutable BString fResult; mutable BString fResult;
}; };

2
src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp

@ -81,7 +81,7 @@ AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings)
if (settings->FindBool("create_xrefs", &fCreateXRefs) != B_OK) if (settings->FindBool("create_xrefs", &fCreateXRefs) != B_OK)
fCreateXRefs = false; fCreateXRefs = false;
if (settings->FindInt32("close_option", (int32)&fCloseOption) != B_OK) if (settings->FindInt32("close_option", (int32*)&fCloseOption) != B_OK)
fCloseOption = kNever; fCloseOption = kNever;
BRect bounds(Bounds()); BRect bounds(Bounds());

9
src/libs/print/libprint/JSDSlider.cpp

@ -26,7 +26,10 @@ JSDSlider::~JSDSlider()
} }
const char* #ifdef __HAIKU__
const
#endif
char*
JSDSlider::UpdateText() const JSDSlider::UpdateText() const
{ {
// When the slider's Draw method is called, this method will also be called. // When the slider's Draw method is called, this method will also be called.
@ -46,5 +49,9 @@ JSDSlider::UpdateText() const
} }
fResult.SetTo(string); fResult.SetTo(string);
#ifdef __HAIKU__
return fResult.String(); return fResult.String();
#else
return const_cast<char*>(fResult.String());
#endif
} }