summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjoye <joye>2014-04-08 17:21:47 (GMT)
committerjoye <joye>2014-04-08 17:21:47 (GMT)
commitd80c7412f31457840a836ba3b35d7eee3b46aa30 (patch)
tree7eb7934ad580f455858d889abd80cbe6984885ae /src
parent988ce9c551172b66c1628636f5e7517baf478b8e (diff)
downloadblt-d80c7412f31457840a836ba3b35d7eee3b46aa30.zip
blt-d80c7412f31457840a836ba3b35d7eee3b46aa30.tar.gz
blt-d80c7412f31457840a836ba3b35d7eee3b46aa30.tar.bz2
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/bltGrMarker.h4
-rw-r--r--src/bltGrMarkerLine.h4
-rw-r--r--src/bltGrMarkerPolygon.h4
-rw-r--r--src/bltGrMarkerText.h4
-rw-r--r--src/bltGrPen.h6
-rw-r--r--src/bltGrPenBar.h4
-rw-r--r--src/bltGrPenLine.h4
7 files changed, 17 insertions, 13 deletions
diff --git a/src/bltGrMarker.h b/src/bltGrMarker.h
index aecc8fe..40a7c9f 100644
--- a/src/bltGrMarker.h
+++ b/src/bltGrMarker.h
@@ -71,11 +71,9 @@ namespace Blt {
Blt_ChainLink link;
unsigned int flags;
- private:
+ protected:
double HMap(Axis*, double);
double VMap(Axis*, double);
-
- protected:
Point2d mapPoint(Point2d*, Axis2d*);
int boxesDontOverlap(Graph*, Region2d*);
int regionInPolygon(Region2d *extsPtr, Point2d *points,
diff --git a/src/bltGrMarkerLine.h b/src/bltGrMarkerLine.h
index 34202d9..ab84a1a 100644
--- a/src/bltGrMarkerLine.h
+++ b/src/bltGrMarkerLine.h
@@ -55,12 +55,12 @@ namespace Blt {
} LineMarkerOptions;
class LineMarker : public Marker {
- private:
+ protected:
GC gc_;
Segment2d* segments_;
int nSegments_;
- private:
+ protected:
int configure();
void draw(Drawable);
void map();
diff --git a/src/bltGrMarkerPolygon.h b/src/bltGrMarkerPolygon.h
index 24fb17d..a451995 100644
--- a/src/bltGrMarkerPolygon.h
+++ b/src/bltGrMarkerPolygon.h
@@ -58,7 +58,7 @@ namespace Blt {
} PolygonMarkerOptions;
class PolygonMarker : public Marker {
- private:
+ protected:
Point2d *screenPts_;
GC outlineGC_;
GC fillGC_;
@@ -67,7 +67,7 @@ namespace Blt {
Segment2d *outlinePts_;
int nOutlinePts_;
- private:
+ protected:
int configure();
void draw(Drawable);
void map();
diff --git a/src/bltGrMarkerText.h b/src/bltGrMarkerText.h
index fc845be..6ae495b 100644
--- a/src/bltGrMarkerText.h
+++ b/src/bltGrMarkerText.h
@@ -52,14 +52,14 @@ namespace Blt {
} TextMarkerOptions;
class TextMarker : public Marker {
- private:
+ protected:
Point2d anchorPt_;
int width_;
int height_;
GC fillGC_;
Point2d outline_[5];
- private:
+ protected:
int configure();
void draw(Drawable);
void map();
diff --git a/src/bltGrPen.h b/src/bltGrPen.h
index a406f2c..c2648a1 100644
--- a/src/bltGrPen.h
+++ b/src/bltGrPen.h
@@ -50,15 +50,17 @@ typedef struct {
} PenOptions;
class Pen {
- public:
+ protected:
Graph* graphPtr_;
const char *name_;
Tk_OptionTable optionTable_;
void* ops_;
int manageOptions_;
+ Tcl_HashEntry *hashPtr_;
+
+ public:
unsigned int flags;
int refCount;
- Tcl_HashEntry *hashPtr_;
public:
Pen();
diff --git a/src/bltGrPenBar.h b/src/bltGrPenBar.h
index 3297b13..da31986 100644
--- a/src/bltGrPenBar.h
+++ b/src/bltGrPenBar.h
@@ -54,7 +54,9 @@ typedef struct {
} BarPenOptions;
class BarPen : public Pen {
- public:
+ friend class BarElement;
+
+ protected:
GC fillGC_;
GC outlineGC_;
GC errorBarGC_;
diff --git a/src/bltGrPenLine.h b/src/bltGrPenLine.h
index e523728..0a2d2fd 100644
--- a/src/bltGrPenLine.h
+++ b/src/bltGrPenLine.h
@@ -74,7 +74,9 @@ typedef struct {
} LinePenOptions;
class LinePen : public Pen {
- public:
+ friend class LineElement;
+
+ protected:
GC traceGC_;
GC errorBarGC_;