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

* Rewrote BeBuild.h which had "a few" consequences (got rid of all those class

Browse Source 
definitions).
* Minor cleanup here and there.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22577 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-10-15 20:13:55 +00:00
parent 4f6e481644
commit f6e4cbb952
135 changed files with 844 additions and 1238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/BMCPrivate.h
+18 -19
View File
@@ -6,20 +6,22 @@
* Marc Flerackers ([email protected])
* Stephan Aßmus <[email protected]>
*/
#ifndef _BMC_PRIVATE_H
#define _BMC_PRIVATE_H
#include <BeBuild.h>
#include <MenuBar.h>
#include <MenuItem.h>
#include <MessageFilter.h>
class BMessageRunner;
class _BMCFilter_ : public BMessageFilter {
public:
_BMCFilter_(BMenuField *menuField, uint32 what);
~_BMCFilter_();
virtual ~_BMCFilter_();
filter_result Filter(BMessage *message, BHandler **handler);
private:
@@ -28,37 +30,34 @@ private:
};
//------------------------------------------------------------------------------
class _BMCMenuBar_ : public BMenuBar {
public:
_BMCMenuBar_(BRect frame, bool fixed_size,
BMenuField *menuField);
_BMCMenuBar_(BMessage *data);
virtual ~_BMCMenuBar_();
virtual ~_BMCMenuBar_();
static BArchivable *Instantiate(BMessage *data);
static BArchivable *Instantiate(BMessage *data);
virtual void AttachedToWindow();
virtual void Draw(BRect updateRect);
virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage* msg);
virtual void MakeFocus(bool focused = true);
virtual void AttachedToWindow();
virtual void Draw(BRect updateRect);
virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage* msg);
virtual void MakeFocus(bool focused = true);
void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; }
bool IsPopUpMarkerShown() const { return fShowPopUpMarker; }
void TogglePopUpMarker(bool show) { fShowPopUpMarker = show; }
bool IsPopUpMarkerShown() const { return fShowPopUpMarker; }
virtual BSize MaxSize();
virtual BSize MaxSize();
private:
_BMCMenuBar_&operator=(const _BMCMenuBar_ &);
_BMCMenuBar_&operator=(const _BMCMenuBar_ &);
BMenuField *fMenuField;
bool fFixedSize;
BMessageRunner *fRunner;
BMessageRunner *fRunner;
bool fShowPopUpMarker;
float fPreviousWidth;
};
//------------------------------------------------------------------------------
#endif // _BMC_PRIVATE_H
headers/private/interface/ColorConversion.h
+4
View File
@@ -1,8 +1,12 @@
#ifndef _COLOR_CONVERSION_H_
#define _COLOR_CONVERSION_H_
#include <GraphicsDefs.h>
class BPoint;
namespace BPrivate {
status_t ConvertBits(const void *srcBits, void *dstBits, int32 srcBitsLength,
headers/private/interface/ColorTools.h
+1 -1
View File
@@ -48,7 +48,7 @@ All rights reserved.
#include <GraphicsDefs.h>
#if B_BEOS_VERSION <= B_BEOS_VERSION_MAUI
#if B_BEOS_VERSION <= B_BEOS_VERSION_5
namespace BExperimental {
headers/private/interface/PictureDataWriter.h
+12 -9
View File
@@ -1,13 +1,13 @@
/*
* Copyright 2006, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stefano Ceccherini ([email protected])
* Copyright 2006-2007, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Stefano Ceccherini ([email protected])
*/
#ifndef __PICTUREDATAWRITER_H
#define __PICTUREDATAWRITER_H
#ifndef _PICTURE_DATA_WRITER_H
#define _PICTURE_DATA_WRITER_H
#include <InterfaceDefs.h>
#include <Font.h>
@@ -16,6 +16,9 @@
#include <stack>
class BPositionIO;
class BRegion;
class PictureDataWriter {
public:
PictureDataWriter();
@@ -80,4 +83,4 @@ private:
std::stack<off_t> fStack;
};
#endif // __PICTUREDATAWRITER_H
#endif // _PICTURE_DATA_WRITER_H
headers/private/interface/PicturePlayer.h
+15 -14
View File
@@ -7,11 +7,10 @@
* Stefano Ceccherini ([email protected])
* Marcus Overhagen ([email protected])
*/
#ifndef _PICTURE_PLAYER_H
#define _PICTURE_PLAYER_H
/** PicturePlayer is used to play picture data. */
#ifndef _PICTUREPLAYER_H
#define _PICTUREPLAYER_H
/*! PicturePlayer is used to play picture data. */
#include <GraphicsDefs.h>
@@ -19,24 +18,26 @@
#include <Rect.h>
#include <DataIO.h>
class BList;
namespace BPrivate {
class PicturePlayer {
public:
PicturePlayer();
PicturePlayer(const void *data, size_t size, BList *pictures);
virtual ~PicturePlayer();
PicturePlayer();
PicturePlayer(const void *data, size_t size, BList *pictures);
virtual ~PicturePlayer();
status_t Play(void **callBackTable, int32 tableEntries,
void *userData);
status_t Play(void **callBackTable, int32 tableEntries,
void *userData);
private:
const void *fData;
size_t fSize;
BList *fPictures;
const void* fData;
size_t fSize;
BList* fPictures;
};
}; // namespace BPrivate
} // namespace BPrivate
#endif // _PICTUREPLAYER_H
#endif // _PICTURE_PLAYER_H
headers/private/interface/input_globals.h
+7 -27
View File
@@ -1,38 +1,18 @@
//------------------------------------------------------------------------------
// Copyright (c) 2004, Haiku
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the
// Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE.
//
// File Name: input_globals.h
// Author:
// Description:
//------------------------------------------------------------------------------
/*
* Copyright 2004-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef __INPUT_GLOBALS_H
#define __INPUT_GLOBALS_H
#include <InterfaceDefs.h>
#include <SupportDefs.h>
class BMessage;
status_t _control_input_server_(BMessage *command, BMessage *reply);
status_t _restore_key_map_();
void _get_key_map(key_map **map, char **key_buffer, ssize_t *key_buffer_size);
#endif // __INPUT_GLOBALS_H