Minor header cleaning.

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 7e869fb82e11a6fec62e8e0e26d058e5b9f63c28..a4b09c94938c0f7874a2a5c881f3aef3f12d2fa2 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,41 +17,45 @@
 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

+#include "wx/gdiobj.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

-    #include "wx/event.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-    #include "wx/dc.h"

     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/icon.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/palette.h"
     #include "wx/icon.h"

+    #include "wx/cursor.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"

 #endif
 
 #endif
 

-#include "wx/bitmap.h"
-#include "wx/cursor.h"
-#include "wx/font.h"
-#include "wx/settings.h"
-#include "wx/hashmap.h"

 
 

-#include <string.h>
+IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

 
 

-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
-#endif

 
 

-#ifdef __WXX11__
-#include "X11/Xlib.h"
+WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
+WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
+WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
+
+WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase;
+
+WXDLLIMPEXP_DATA_CORE(wxBitmap)  wxNullBitmap;
+WXDLLIMPEXP_DATA_CORE(wxBrush)   wxNullBrush;
+WXDLLIMPEXP_DATA_CORE(wxColour)  wxNullColour;
+WXDLLIMPEXP_DATA_CORE(wxCursor)  wxNullCursor;
+WXDLLIMPEXP_DATA_CORE(wxFont)    wxNullFont;
+WXDLLIMPEXP_DATA_CORE(wxIcon)    wxNullIcon;
+WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
+#if wxUSE_PALETTE
+WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;

 #endif
 
 #endif
 

+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
+

 #if wxUSE_EXTENDED_RTTI
 
 // wxPoint
 #if wxUSE_EXTENDED_RTTI
 
 // wxPoint


@@ -86,8 +86,6 @@ wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<w
 
 #endif
 
 
 #endif
 

-IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-

 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;
 wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
 {
     x = point1.x;


@@ -185,7 +183,7 @@ wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
     return *this;
 }
 
     return *this;
 }
 

-bool wxRect::Inside(int cx, int cy) const
+bool wxRect::Contains(int cx, int cy) const

 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)
 {
     return ( (cx >= x) && (cy >= y)
           && ((cy - y) < height)


@@ -193,6 +191,11 @@ bool wxRect::Inside(int cx, int cy) const
           );
 }
 
           );
 }
 

+bool wxRect::Contains(const wxRect& rect) const
+{
+    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
+}
+

 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),
 wxRect& wxRect::Intersect(const wxRect& rect)
 {
     int x2 = GetRight(),


@@ -324,7 +327,7 @@ void wxColourDatabase::Initialize()
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},
         {wxT("ORANGE RED"), 255, 0, 127},
         {wxT("ORCHID"), 219, 112, 219},
         {wxT("PALE GREEN"), 143, 188, 143},

-        {wxT("PINK"), 188, 143, 234},
+        {wxT("PINK"), 255, 192, 203},

         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},
         {wxT("PLUM"), 234, 173, 234},
         {wxT("PURPLE"), 176, 0, 255},
         {wxT("RED"), 255, 0, 0},