From 27987c6ee00273948920015c1da851f150279154 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 24 Feb 2011 18:02:11 +0000
Subject: Made struct matrix a subclass of Fl_Graphics_Device class to avoid
 collision with application-defined names.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8471 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Device.cxx | 2 +-
 src/fl_rect.cxx   | 4 ++--
 src/fl_vertex.cxx | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx
index 70d7f5fa3..54a3224a3 100644
--- a/src/Fl_Device.cxx
+++ b/src/Fl_Device.cxx
@@ -51,7 +51,7 @@ void Fl_Surface_Device::set_current(void)
   _surface = this;
 }
 
-static matrix m0 = {1, 0, 0, 1, 0, 0};
+const Fl_Graphics_Driver::matrix Fl_Graphics_Driver::m0 = {1, 0, 0, 1, 0, 0};
 
 Fl_Graphics_Driver::Fl_Graphics_Driver() {
   font_ = 0;
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
index 703dd82bd..adba7a909 100644
--- a/src/fl_rect.cxx
+++ b/src/fl_rect.cxx
@@ -590,14 +590,14 @@ void Fl_Graphics_Driver::push_clip(int x, int y, int w, int h) {
 # error unsupported platform
 #endif
   }
-  if (rstackptr < REGION_STACK_MAX) rstack[++rstackptr] = r;
+  if (rstackptr < region_stack_max) rstack[++rstackptr] = r;
   else Fl::warning("fl_push_clip: clip stack overflow!\n");
   fl_restore_clip();
 }
 
 // make there be no clip (used by fl_begin_offscreen() only!)
 void Fl_Graphics_Driver::push_no_clip() {
-  if (rstackptr < REGION_STACK_MAX) rstack[++rstackptr] = 0;
+  if (rstackptr < region_stack_max) rstack[++rstackptr] = 0;
   else Fl::warning("fl_push_no_clip: clip stack overflow!\n");
   fl_restore_clip();
 }
diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx
index 478d85474..c63c8c54a 100644
--- a/src/fl_vertex.cxx
+++ b/src/fl_vertex.cxx
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 
 void Fl_Graphics_Driver::push_matrix() {
-  if (sptr==MATRIX_STACK_SIZE)
+  if (sptr==matrix_stack_size)
     Fl::error("fl_push_matrix(): matrix stack overflow.");
   else
     stack[sptr++] = m;
-- 
cgit v1.2.3