fix typo in drawing slider ticks; added assert to check for it (slightly modified...

[wxWidgets.git] / include / wx / mac / region.h

diff --git a/include/wx/mac/region.h b/include/wx/mac/region.h
index ee40f921f7e88d3f5c76ff5709bc50cf21f50334..019c9a4365a828d3a163d39be10aecae3102f64f 100644 (file)
--- a/include/wx/mac/region.h
+++ b/include/wx/mac/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "region.h"
 #endif
 
 #pragma interface "region.h"
 #endif
 


@@ -128,13 +128,13 @@ public:
     ~wxRegionIterator();
 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);
     ~wxRegionIterator();
 
     wxRegionIterator& operator=(const wxRegionIterator& iterator);

-    
+

     void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
     
     operator bool () const { return m_current < m_numRects; }
     bool HaveRects() const { return m_current < m_numRects; }
     void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
     
     operator bool () const { return m_current < m_numRects; }
     bool HaveRects() const { return m_current < m_numRects; }

-    
+

     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);
     
     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);
     


@@ -146,6 +146,8 @@ public:
     long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 private:
     long GetHeight() const { return GetH(); }
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 private:

+    void SetRects(long numRects, wxRect *rects);
+

     long     m_current;
     long     m_numRects;
     wxRegion m_region;
     long     m_current;
     long     m_numRects;
     wxRegion m_region;