fixed bug in DeleteEntry()

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index f9d4497c95438a528206d5e4ee0fc61e7adccc81..1057dc55ed63520f0a5769dbdad0a863ad6e76b0 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "gdicmn.h"
 #endif
 
@@ -214,6 +214,11 @@ public:
     // FIXME are these really useful? If they're, we should have += &c as well
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
+    
+    void IncTo(const wxSize& sz)
+        { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
+    void DecTo(const wxSize& sz)
+        { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }
 
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
@@ -270,11 +275,6 @@ public:
     wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; }
 };
 
-#if WXWIN_COMPATIBILITY
-    #define wxIntPoint wxPoint
-    #define wxRectangle wxRect
-#endif // WXWIN_COMPATIBILITY
-
 // ---------------------------------------------------------------------------
 // wxRect
 // ---------------------------------------------------------------------------
@@ -377,11 +377,9 @@ typedef wxInt8 wxDash;
 
 class WXDLLEXPORT wxPenList : public wxList
 {
-    // DECLARE_DYNAMIC_CLASS(wxPenList)
-
 public:
     wxPenList() { }
-    virtual ~wxPenList();
+    ~wxPenList();
 
     void AddPen(wxPen *pen);
     void RemovePen(wxPen *pen);
@@ -390,11 +388,9 @@ public:
 
 class WXDLLEXPORT wxBrushList : public wxList
 {
-    // DECLARE_DYNAMIC_CLASS(wxBrushList)
-
 public:
     wxBrushList() { }
-    virtual ~wxBrushList();
+    ~wxBrushList();
 
     void AddBrush(wxBrush *brush);
     void RemoveBrush(wxBrush *brush);
@@ -403,11 +399,9 @@ public:
 
 class WXDLLEXPORT wxFontList : public wxList
 {
-    // DECLARE_DYNAMIC_CLASS(wxFontList)
-
 public:
     wxFontList() { }
-    virtual ~wxFontList();
+    ~wxFontList();
 
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
@@ -421,11 +415,9 @@ class WXDLLEXPORT wxStringToColourHashMap;
 
 class WXDLLEXPORT wxColourDatabase
 {
-    // DECLARE_CLASS(wxColourDatabase)
-
 public:
     wxColourDatabase();
-    virtual ~wxColourDatabase() ;
+    ~wxColourDatabase() ;
 
     // Not const because it may add a name to the database
     wxColour *FindColour(const wxString& colour) ;
@@ -446,11 +438,9 @@ private:
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {
-    // DECLARE_DYNAMIC_CLASS(wxBitmapList)
-
 public:
     wxBitmapList();
-    virtual ~wxBitmapList();
+    ~wxBitmapList();
 
     void AddBitmap(wxBitmap *bitmap);
     void RemoveBitmap(wxBitmap *bitmap);
@@ -463,10 +453,7 @@ public:
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif
-    virtual ~wxResourceCache();
-
-private:
-    // DECLARE_DYNAMIC_CLASS(wxResourceCache)
+    ~wxResourceCache();
 };
 
 // ---------------------------------------------------------------------------