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

Added Calculator to the build, and fixed build for Dano.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17685 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-06-01 09:27:37 +00:00
parent f883a05a74
commit 9427e13a87
2 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/Jamfile
+1
View File
@@ -2,6 +2,7 @@ SubDir HAIKU_TOP src apps ;
SubInclude HAIKU_TOP src apps abouthaiku ; SubInclude HAIKU_TOP src apps abouthaiku ;
SubInclude HAIKU_TOP src apps bemail ; SubInclude HAIKU_TOP src apps bemail ;
SubInclude HAIKU_TOP src apps calculator ;
SubInclude HAIKU_TOP src apps cdplayer ; SubInclude HAIKU_TOP src apps cdplayer ;
SubInclude HAIKU_TOP src apps clock ; SubInclude HAIKU_TOP src apps clock ;
SubInclude HAIKU_TOP src apps codycam ; SubInclude HAIKU_TOP src apps codycam ;
src/apps/calculator/CalcView.h
+19 -22
View File
@@ -5,34 +5,24 @@
* Authors: * Authors:
* Peter Wagner <[email protected]> * Peter Wagner <[email protected]>
*/ */
#ifndef __CALC_VIEW__ #ifndef CALC_VIEW_H
#define __CALC_VIEW__ #define CALC_VIEW_H
#include <View.h> #include <View.h>
#include <Message.h> #include <Message.h>
#include "FrameView.h" #include "FrameView.h"
#include "CalcEngine.h" #include "CalcEngine.h"
class _EXPORT CalcView : public BView class BStringView;
{
class _EXPORT CalcView : public BView {
public: public:
static void About(void);
static float TheWidth() { return 272; }
static float TheHeight() { return 284; }
static BRect TheRect() { return TheRect(0,0); }
static BRect TheRect(const BPoint &pt) { return TheRect(pt.x,pt.y); }
static BRect TheRect(float x, float y) { return BRect(x,y,x+TheWidth(),y+TheHeight()); }
static float ExtraHeight() { return 43; }
CalcView(BRect frame); CalcView(BRect frame);
CalcView(BMessage *msg);
virtual ~CalcView(); virtual ~CalcView();
// replicant
CalcView(BMessage *msg);
virtual status_t Archive(BMessage *msg, bool deep) const; virtual status_t Archive(BMessage *msg, bool deep) const;
static BArchivable* Instantiate(BMessage *msg); static BArchivable* Instantiate(BMessage *msg);
@@ -53,8 +43,17 @@ public:
BView *AddExtra(); BView *AddExtra();
static void About();
static float TheWidth() { return 272; }
static float TheHeight() { return 284; }
static BRect TheRect() { return TheRect(0,0); }
static BRect TheRect(const BPoint &pt) { return TheRect(pt.x,pt.y); }
static BRect TheRect(float x, float y) { return BRect(x,y,x+TheWidth(),y+TheHeight()); }
static float ExtraHeight() { return 43; }
private: private:
void Init(void); void Init();
CalcEngine calc; CalcEngine calc;
bool is_replicant; bool is_replicant;
@@ -63,13 +62,11 @@ private:
enum { state_unknown=0, state_active, state_inactive }; enum { state_unknown=0, state_active, state_inactive };
void ChangeHighlight(); void ChangeHighlight();
FrameView *lcd_frame; FrameView *lcd_frame;
BStringView *lcd; BStringView *lcd;
BStringView *binary_sign_view; BStringView *binary_sign_view;
BStringView *binary_exponent_view; BStringView *binary_exponent_view;
BStringView *binary_number_view; BStringView *binary_number_view;
}; };
#endif #endif // CALC_VIEW_H