i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc 3 fixes; strip ^M characters from TextView.cpp

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4226 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shadow303
2003-08-04 00:42:51 +00:00
parent 00e2926fda
commit 72f334d12f
7 changed files with 1657 additions and 1652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+3 -1
View File
@@ -25,7 +25,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Standard Includes ----------------------------------------------------------- // Standard Includes -----------------------------------------------------------
#include <algobase.h> #include <algorithm>
// System Includes ------------------------------------------------------------- // System Includes -------------------------------------------------------------
#include <Application.h> #include <Application.h>
@@ -48,6 +48,8 @@
#include "moreUTF8.h" #include "moreUTF8.h"
// Local Defines --------------------------------------------------------------- // Local Defines ---------------------------------------------------------------
using std::min;
using std::max;
// _BTextTrackState_ class ----------------------------------------------------- // _BTextTrackState_ class -----------------------------------------------------
class _BTextTrackState_ { class _BTextTrackState_ {
src/kits/interface/Globals.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ _IMPEXP_BE const color_map *system_colors()
// TODO: Implement // 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(); BPrivate::BAppServerLink *link=new BPrivate::BAppServerLink();
link->SetOpCode(AS_SET_SCREEN_MODE); link->SetOpCode(AS_SET_SCREEN_MODE);
src/kits/interface/Picture.cpp
+4 -3
View File
@@ -28,6 +28,7 @@
// Standard Includes ----------------------------------------------------------- // Standard Includes -----------------------------------------------------------
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
// System Includes ------------------------------------------------------------- // System Includes -------------------------------------------------------------
#include <Picture.h> #include <Picture.h>
@@ -194,7 +195,7 @@ BPicture::BPicture(BMessage *archive)
// What with the sub pictures? // What with the sub pictures?
for (i = 0; i < extent->fPictures.CountItems(); i++) for (i = 0; i < extent->fPictures.CountItems(); i++)
delete extent->fPictures.ItemAt(i); delete (BPicture *)extent->fPictures.ItemAt(i);
extent->fPictures.MakeEmpty(); extent->fPictures.MakeEmpty();
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -224,7 +225,7 @@ BPicture::~BPicture()
} }
for (int32 i = 0; i < extent->fPictures.CountItems(); i++) for (int32 i = 0; i < extent->fPictures.CountItems(); i++)
delete extent->fPictures.ItemAt(i); delete (BPicture *)extent->fPictures.ItemAt(i);
extent->fPictures.MakeEmpty(); extent->fPictures.MakeEmpty();
free(extent); free(extent);
@@ -572,7 +573,7 @@ void BPicture::usurp(BPicture *lameDuck)
} }
for (int32 i = 0; i < extent->fPictures.CountItems(); i++) for (int32 i = 0; i < extent->fPictures.CountItems(); i++)
delete extent->fPictures.ItemAt(i); delete (BPicture *)extent->fPictures.ItemAt(i);
extent->fPictures.MakeEmpty(); extent->fPictures.MakeEmpty();
free(extent); free(extent);
src/kits/interface/PictureButton.cpp
+3 -3
View File
@@ -45,9 +45,9 @@ BPictureButton::BPictureButton (BRect frame,
BPicture *off, BPicture *off,
BPicture *on, BPicture *on,
BMessage *message, BMessage *message,
uint32 behavior = B_ONE_STATE_BUTTON, uint32 behavior,
uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP, uint32 resizeMask,
uint32 flgs = B_WILL_DRAW | B_NAVIGABLE) uint32 flgs)
: BControl (frame, name, "", message, resizeMask, flgs), fOutlined (false), : BControl (frame, name, "", message, resizeMask, flgs), fOutlined (false),
fBehavior (behavior) fBehavior (behavior)
{ {
src/kits/interface/Region.cpp
+1
View File
@@ -28,6 +28,7 @@
// Standard Includes ----------------------------------------------------------- // Standard Includes -----------------------------------------------------------
#include <cstdlib> #include <cstdlib>
#include <string.h>
// System Includes ------------------------------------------------------------- // System Includes -------------------------------------------------------------
#include <Debug.h> #include <Debug.h>
src/kits/interface/View.cpp
+8 -8
View File
@@ -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)
{ {
} }
src/kits/interface/region_helpers.cpp
+1
View File
@@ -1,3 +1,4 @@
#include <string.h>
#include <Debug.h> #include <Debug.h>
#include <Region.h> #include <Region.h>