move misc surface helpers to wxIDirectFBSurface class

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index b1e5d72c182367316f3e1ba7bb949b3943954d2d..1c02e3dfc972edcf2dd79f716ecf6e88819aa8ff 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -229,6 +229,9 @@ public:
     void DecTo(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; }
 

+    void Scale(float xscale, float yscale)
+        { x = (int)(x*xscale); y = (int)(y*yscale); }
+

     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }
     // accessors
     void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }


@@ -304,6 +307,8 @@ public:
 
     wxPoint operator+(const wxSize& s) const { return wxPoint(x + s.GetWidth(), y + s.GetHeight()); }
     wxPoint operator-(const wxSize& s) const { return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }
 
     wxPoint operator+(const wxSize& s) const { return wxPoint(x + s.GetWidth(), y + s.GetHeight()); }
     wxPoint operator-(const wxSize& s) const { return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }

+
+    wxPoint operator-() const { return wxPoint(-x, -y); }

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


@@ -414,6 +419,8 @@ public:
     // return true if the point is (not strcitly) inside the rect
     bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }
     // return true if the point is (not strcitly) inside the rect
     bool Inside(int x, int y) const;
     bool Inside(const wxPoint& pt) const { return Inside(pt.x, pt.y); }

+    // return true if the rectangle is (not strcitly) inside the rect
+    bool Inside(const wxRect& rect) const;

 
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;


@@ -494,7 +501,7 @@ public:
 #endif
 };
 
 #endif
 };
 

-WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );
+WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);

 
 class WXDLLEXPORT wxColourDatabase
 {
 
 class WXDLLEXPORT wxColourDatabase
 {


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

-    ~wxResourceCache();
+    virtual ~wxResourceCache();

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


@@ -676,9 +683,6 @@ extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
 extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
 extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 

-// The list of objects which should be deleted
-extern WXDLLEXPORT_DATA(wxList) wxPendingDelete;
-

 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------