* put Transformable class into BPrivate::Icon namespace, which
solves the problem that app_server uses the wrong version of the class * TODO: put all the other classes into this namespace as well, I'm just eager to close this crucial bug, which Ingo kindly tracked down [darn, this commit stalled before, and I commited the next step already from another Terminal...] git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20481 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -42,12 +42,12 @@ class ShapeListener {
|
||||
|
||||
#ifdef ICON_O_MATIC
|
||||
class Shape : public IconObject,
|
||||
public Transformable,
|
||||
public BPrivate::Icon::Transformable,
|
||||
public Observer, // observing all the paths and the style
|
||||
public PathContainerListener,
|
||||
public PathListener {
|
||||
#else
|
||||
class Shape : public Transformable {
|
||||
class Shape : public BPrivate::Icon::Transformable {
|
||||
#endif
|
||||
|
||||
public:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2006, Haiku.
|
||||
* Copyright 2006-2007, Haiku.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*
|
||||
* Authors:
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
#include <agg_path_storage.h>
|
||||
|
||||
#include "Transformable.h"
|
||||
|
||||
#ifdef ICON_O_MATIC
|
||||
# include <Archivable.h>
|
||||
# include <List.h>
|
||||
@@ -24,7 +26,6 @@
|
||||
class BBitmap;
|
||||
class BMessage;
|
||||
class BView;
|
||||
class Transformable;
|
||||
|
||||
struct control_point {
|
||||
BPoint point; // actual point on path
|
||||
@@ -84,7 +85,7 @@ class VectorPath {
|
||||
|
||||
// VectorPath
|
||||
VectorPath& operator=(const VectorPath& from);
|
||||
// bool operator==(const VectorPath& frrom) const;
|
||||
// bool operator==(const VectorPath& from) const;
|
||||
|
||||
void MakeEmpty();
|
||||
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
|
||||
#include <agg_trans_affine.h>
|
||||
|
||||
namespace BPrivate {
|
||||
namespace Icon {
|
||||
|
||||
class Transformable : public agg::trans_affine {
|
||||
public:
|
||||
enum {
|
||||
@@ -66,5 +69,10 @@ class Transformable : public agg::trans_affine {
|
||||
// is changed for some reason
|
||||
};
|
||||
|
||||
} // namespace Icon
|
||||
} // namespace BPrivate
|
||||
|
||||
using namespace BPrivate::Icon;
|
||||
|
||||
#endif // TRANSFORMABLE_H
|
||||
|
||||
|
||||
Reference in New Issue
Block a user