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

* put Transformable class into BPrivate::Icon namespace, which

Browse Source 
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:
Stephan Aßmus
2007-03-31 18:24:32 +00:00
parent d2e5bdb4e8
commit 84db3be8a9
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/icon/shape/Shape.h
+2 -2
View File
@@ -42,12 +42,12 @@ class ShapeListener {
#ifdef ICON_O_MATIC #ifdef ICON_O_MATIC
class Shape : public IconObject, class Shape : public IconObject,
public Transformable, public BPrivate::Icon::Transformable,
public Observer, // observing all the paths and the style public Observer, // observing all the paths and the style
public PathContainerListener, public PathContainerListener,
public PathListener { public PathListener {
#else #else
class Shape : public Transformable { class Shape : public BPrivate::Icon::Transformable {
#endif #endif
public: public:
src/libs/icon/shape/VectorPath.h
+4 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku. * Copyright 2006-2007, Haiku.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -14,6 +14,8 @@
#include <agg_path_storage.h> #include <agg_path_storage.h>
#include "Transformable.h"
#ifdef ICON_O_MATIC #ifdef ICON_O_MATIC
# include <Archivable.h> # include <Archivable.h>
# include <List.h> # include <List.h>
@@ -24,7 +26,6 @@
class BBitmap; class BBitmap;
class BMessage; class BMessage;
class BView; class BView;
class Transformable;
struct control_point { struct control_point {
BPoint point; // actual point on path BPoint point; // actual point on path
@@ -84,7 +85,7 @@ class VectorPath {
// VectorPath // VectorPath
VectorPath& operator=(const VectorPath& from); VectorPath& operator=(const VectorPath& from);
// bool operator==(const VectorPath& frrom) const; // bool operator==(const VectorPath& from) const;
void MakeEmpty(); void MakeEmpty();
src/libs/icon/transformable/Transformable.h
+8
View File
@@ -13,6 +13,9 @@
#include <agg_trans_affine.h> #include <agg_trans_affine.h>
namespace BPrivate {
namespace Icon {
class Transformable : public agg::trans_affine { class Transformable : public agg::trans_affine {
public: public:
enum { enum {
@@ -66,5 +69,10 @@ class Transformable : public agg::trans_affine {
// is changed for some reason // is changed for some reason
}; };
} // namespace Icon
} // namespace BPrivate
using namespace BPrivate::Icon;
#endif // TRANSFORMABLE_H #endif // TRANSFORMABLE_H