MVC works now.

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 5eec88fe8222f64bd5808674f80ef360f3e0613e..80eca895364e1c65bb83377f171fe86c279b4eac 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -10,10 +10,6 @@
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 
 #ifndef _WX_GTK_REGION_H_
 #define _WX_GTK_REGION_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"


@@ -22,7 +18,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxRegion;
+class WXDLLIMPEXP_CORE wxRegion;

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -49,7 +45,7 @@ enum wxRegionOp
 // wxRegion
 // ----------------------------------------------------------------------------
 
 // wxRegion
 // ----------------------------------------------------------------------------
 

-class wxRegion : public wxGDIObject
+class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject

 {
 public:
     wxRegion() { }
 {
 public:
     wxRegion() { }


@@ -84,15 +80,10 @@ public:
 
     ~wxRegion();
 
 
     ~wxRegion();
 

-    wxRegion( const wxRegion& region )
-        : wxGDIObject()
-        { Ref(region); }
-    wxRegion& operator = ( const wxRegion& region ) { Ref(region); return *this; }
-

     bool Ok() const { return m_refData != NULL; }
 
     bool Ok() const { return m_refData != NULL; }
 

-    bool operator == ( const wxRegion& region );
-    bool operator != ( const wxRegion& region ) { return !(*this == region); }
+    bool operator == ( const wxRegion& region ) const;
+    bool operator != ( const wxRegion& region ) const { return !(*this == region); }

 
     void Clear();
 
 
     void Clear();
 


@@ -155,14 +146,14 @@ protected:
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegion);
+    DECLARE_DYNAMIC_CLASS(wxRegion)

 };
 
 // ----------------------------------------------------------------------------
 // wxRegionIterator: decomposes a region into rectangles
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxRegionIterator: decomposes a region into rectangles
 // ----------------------------------------------------------------------------
 

-class wxRegionIterator: public wxObject
+class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject

 {
 public:
     wxRegionIterator();
 {
 public:
     wxRegionIterator();


@@ -190,7 +181,7 @@ private:
     wxRegion m_region;
 
 private:
     wxRegion m_region;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)

 };
 
 
 };