[ 1557284 ] wxGenericComboControl -> wxGenericComboCtrl

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

diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h
index 1e6dae11e4fba73d45b928d12028d2d33f25ef96..ec8c23c5966b665d69d6263e33cfaa26f1ac1a1b 100644 (file)
--- a/include/wx/mgl/region.h
+++ b/include/wx/mgl/region.h
@@ -11,10 +11,6 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "region.h"
-#endif
-
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
@@ -23,13 +19,6 @@ class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
 class MGLRegion;
 
-enum wxRegionContain
-{
-    wxOutRegion = 0,
-    wxPartRegion = 1,
-    wxInRegion = 2
-};
-
 class WXDLLEXPORT wxRegion : public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxRegion);
@@ -51,13 +40,7 @@ public:
     }
 
     wxRegion();
-    ~wxRegion();
-
-    //# Copying
-    inline wxRegion(const wxRegion& r)
-        { Ref(r); }
-    inline wxRegion& operator = (const wxRegion& r)
-        { Ref(r); return (*this); }
+    virtual ~wxRegion();
 
     //# Modify region
     // Clear current region
@@ -137,7 +120,7 @@ class WXDLLEXPORT wxRegionIterator : public wxObject
 public:
     wxRegionIterator(void);
     wxRegionIterator(const wxRegion& region);
-    ~wxRegionIterator(void);
+    virtual ~wxRegionIterator(void);
 
     void Reset(void) { m_currentNode = NULL; }
     void Reset(const wxRegion& region);