gcc 3 fixes; strip ^M characters from TextView.cpp
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4226 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
00e2926fda
commit
72f334d12f
File diff suppressed because it is too large
Load Diff
@ -43,7 +43,7 @@ _IMPEXP_BE const color_map *system_colors()
|
||||
// TODO: Implement
|
||||
}
|
||||
|
||||
_IMPEXP_BE status_t set_screen_space(int32 index, uint32 res, bool stick = true)
|
||||
_IMPEXP_BE status_t set_screen_space(int32 index, uint32 res, bool stick)
|
||||
{
|
||||
BPrivate::BAppServerLink *link=new BPrivate::BAppServerLink();
|
||||
link->SetOpCode(AS_SET_SCREEN_MODE);
|
||||
|
@ -28,6 +28,7 @@
|
||||
// Standard Includes -----------------------------------------------------------
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
// System Includes -------------------------------------------------------------
|
||||
#include <Picture.h>
|
||||
@ -194,7 +195,7 @@ BPicture::BPicture(BMessage *archive)
|
||||
|
||||
// What with the sub pictures?
|
||||
for (i = 0; i < extent->fPictures.CountItems(); i++)
|
||||
delete extent->fPictures.ItemAt(i);
|
||||
delete (BPicture *)extent->fPictures.ItemAt(i);
|
||||
extent->fPictures.MakeEmpty();
|
||||
}
|
||||
//------------------------------------------------------------------------------
|
||||
@ -224,7 +225,7 @@ BPicture::~BPicture()
|
||||
}
|
||||
|
||||
for (int32 i = 0; i < extent->fPictures.CountItems(); i++)
|
||||
delete extent->fPictures.ItemAt(i);
|
||||
delete (BPicture *)extent->fPictures.ItemAt(i);
|
||||
extent->fPictures.MakeEmpty();
|
||||
|
||||
free(extent);
|
||||
@ -572,7 +573,7 @@ void BPicture::usurp(BPicture *lameDuck)
|
||||
}
|
||||
|
||||
for (int32 i = 0; i < extent->fPictures.CountItems(); i++)
|
||||
delete extent->fPictures.ItemAt(i);
|
||||
delete (BPicture *)extent->fPictures.ItemAt(i);
|
||||
extent->fPictures.MakeEmpty();
|
||||
|
||||
free(extent);
|
||||
|
@ -45,9 +45,9 @@ BPictureButton::BPictureButton (BRect frame,
|
||||
BPicture *off,
|
||||
BPicture *on,
|
||||
BMessage *message,
|
||||
uint32 behavior = B_ONE_STATE_BUTTON,
|
||||
uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
||||
uint32 flgs = B_WILL_DRAW | B_NAVIGABLE)
|
||||
uint32 behavior,
|
||||
uint32 resizeMask,
|
||||
uint32 flgs)
|
||||
: BControl (frame, name, "", message, resizeMask, flgs), fOutlined (false),
|
||||
fBehavior (behavior)
|
||||
{
|
||||
|
@ -28,6 +28,7 @@
|
||||
|
||||
// Standard Includes -----------------------------------------------------------
|
||||
#include <cstdlib>
|
||||
#include <string.h>
|
||||
|
||||
// System Includes -------------------------------------------------------------
|
||||
#include <Debug.h>
|
||||
|
@ -406,7 +406,7 @@ float BView::PenSize() const
|
||||
{
|
||||
}
|
||||
|
||||
void BView::SetViewCursor(const BCursor *cursor, bool sync=true)
|
||||
void BView::SetViewCursor(const BCursor *cursor, bool sync)
|
||||
{
|
||||
}
|
||||
|
||||
@ -418,11 +418,11 @@ rgb_color BView::ViewColor() const
|
||||
{
|
||||
}
|
||||
|
||||
void BView::SetViewBitmap(const BBitmap *bitmap,BRect srcRect, BRect dstRect,uint32 followFlags=B_FOLLOW_TOP|B_FOLLOW_LEFT,uint32 options=B_TILE_BITMAP)
|
||||
void BView::SetViewBitmap(const BBitmap *bitmap,BRect srcRect, BRect dstRect,uint32 followFlags,uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
void BView::SetViewBitmap(const BBitmap *bitmap,uint32 followFlags=B_FOLLOW_TOP|B_FOLLOW_LEFT,uint32 options=B_TILE_BITMAP)
|
||||
void BView::SetViewBitmap(const BBitmap *bitmap,uint32 followFlags,uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
@ -430,11 +430,11 @@ void BView::ClearViewBitmap()
|
||||
{
|
||||
}
|
||||
|
||||
status_t BView::SetViewOverlay(const BBitmap *overlay,BRect srcRect, BRect dstRect,rgb_color *colorKey,uint32 followFlags=B_FOLLOW_TOP|B_FOLLOW_LEFT,uint32 options=0)
|
||||
status_t BView::SetViewOverlay(const BBitmap *overlay,BRect srcRect, BRect dstRect,rgb_color *colorKey,uint32 followFlags,uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
status_t BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,uint32 followFlags=B_FOLLOW_TOP|B_FOLLOW_LEFT,uint32 options=0)
|
||||
status_t BView::SetViewOverlay(const BBitmap *overlay, rgb_color *colorKey,uint32 followFlags,uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
@ -458,7 +458,7 @@ rgb_color BView::LowColor() const
|
||||
{
|
||||
}
|
||||
|
||||
void BView::SetLineMode(cap_mode lineCap,join_mode lineJoin,float miterLimit=B_DEFAULT_MITER_LIMIT)
|
||||
void BView::SetLineMode(cap_mode lineCap,join_mode lineJoin,float miterLimit)
|
||||
{
|
||||
}
|
||||
|
||||
@ -790,7 +790,7 @@ void BView::DrawPictureAsync(const char *filename, long offset, BPoint where)
|
||||
{
|
||||
}
|
||||
|
||||
status_t BView::SetEventMask(uint32 mask, uint32 options=0)
|
||||
status_t BView::SetEventMask(uint32 mask, uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
@ -798,7 +798,7 @@ uint32 BView::EventMask()
|
||||
{
|
||||
}
|
||||
|
||||
status_t BView::SetMouseEventMask(uint32 mask, uint32 options=0)
|
||||
status_t BView::SetMouseEventMask(uint32 mask, uint32 options)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
#include <string.h>
|
||||
#include <Debug.h>
|
||||
#include <Region.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user