Avoid double free in wxComboBox::SetClientObject.

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index ae96ef17944b4ca9dfb3cd4af22f52e065b9ad65..9002d14e11e138bc5fd27c6a141b5559c864f4f5 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

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

     #pragma interface "gdicmn.h"
 #endif
 
     #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); }
     // 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; }
 
     // 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; }
 };
 
     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
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxRect
 // ---------------------------------------------------------------------------


@@ -377,11 +377,9 @@ typedef wxInt8 wxDash;
 
 class WXDLLEXPORT wxPenList : public wxList
 {
 
 class WXDLLEXPORT wxPenList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxPenList)
-

 public:
     wxPenList() { }
 public:
     wxPenList() { }

-    virtual ~wxPenList();
+    ~wxPenList();

 
     void AddPen(wxPen *pen);
     void RemovePen(wxPen *pen);
 
     void AddPen(wxPen *pen);
     void RemovePen(wxPen *pen);


@@ -390,11 +388,9 @@ public:
 
 class WXDLLEXPORT wxBrushList : public wxList
 {
 
 class WXDLLEXPORT wxBrushList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxBrushList)
-

 public:
     wxBrushList() { }
 public:
     wxBrushList() { }

-    virtual ~wxBrushList();
+    ~wxBrushList();

 
     void AddBrush(wxBrush *brush);
     void RemoveBrush(wxBrush *brush);
 
     void AddBrush(wxBrush *brush);
     void RemoveBrush(wxBrush *brush);


@@ -403,11 +399,9 @@ public:
 
 class WXDLLEXPORT wxFontList : public wxList
 {
 
 class WXDLLEXPORT wxFontList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxFontList)
-

 public:
     wxFontList() { }
 public:
     wxFontList() { }

-    virtual ~wxFontList();
+    ~wxFontList();

 
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);
 
     void AddFont(wxFont *font);
     void RemoveFont(wxFont *font);


@@ -421,35 +415,41 @@ class WXDLLEXPORT wxStringToColourHashMap;
 
 class WXDLLEXPORT wxColourDatabase
 {
 
 class WXDLLEXPORT wxColourDatabase
 {

-    // DECLARE_CLASS(wxColourDatabase)
-

 public:
     wxColourDatabase();
 public:
     wxColourDatabase();

-    virtual ~wxColourDatabase() ;
+    ~wxColourDatabase();

 
 

-    // Not const because it may add a name to the database
-    wxColour *FindColour(const wxString& colour) ;
-    wxColour *FindColourNoAdd(const wxString& colour) const;
+    // find colour by name or name for the given colour
+    wxColour Find(const wxString& name) const;

     wxString FindName(const wxColour& colour) const;
     wxString FindName(const wxColour& colour) const;

-    void Initialize();
+
+    // add a new colour to the database
+    void AddColour(const wxString& name, const wxColour& colour);
+
+    // deprecated, use Find()/Add() instead
+    wxColour *FindColour(const wxString& name);
+    void AddColour(const wxString& name, wxColour *colour);
+
+

 #ifdef __WXPM__
     // PM keeps its own type of colour table
     long*                           m_palTable;
     size_t                          m_nSize;
 #endif
 #ifdef __WXPM__
     // PM keeps its own type of colour table
     long*                           m_palTable;
     size_t                          m_nSize;
 #endif

+

 private:
 private:

-    wxColour* FindColour(const wxString& colour, bool add);
+    // load the database with the built in colour values when called for the
+    // first time, do nothing after this
+    void Initialize();

 
 

-    wxStringToColourHashMap* m_map;
+    wxStringToColourHashMap *m_map;

 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {
 };
 
 class WXDLLEXPORT wxBitmapList : public wxList
 {

-    // DECLARE_DYNAMIC_CLASS(wxBitmapList)
-

 public:
     wxBitmapList();
 public:
     wxBitmapList();

-    virtual ~wxBitmapList();
+    ~wxBitmapList();

 
     void AddBitmap(wxBitmap *bitmap);
     void RemoveBitmap(wxBitmap *bitmap);
 
     void AddBitmap(wxBitmap *bitmap);
     void RemoveBitmap(wxBitmap *bitmap);


@@ -462,10 +462,7 @@ public:
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif
 #if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif

-    virtual ~wxResourceCache();
-
-private:
-    // DECLARE_DYNAMIC_CLASS(wxResourceCache)
+    ~wxResourceCache();

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------