// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#include "wx/event.h"
#include "wx/gdicmn.h"
-#include "wx/brush.h"
-#include "wx/pen.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/cursor.h"
-#include "wx/font.h"
-#include "wx/palette.h"
-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
-#include "wx/settings.h"
-#include "wx/hashmap.h"
-
-#include "wx/log.h"
-#include <string.h>
-
-#ifdef __WXMOTIF__
-#ifdef __VMS__
-#pragma message disable nosimpint
-#endif
-#include <Xm/Xm.h>
-#ifdef __VMS__
-#pragma message enable nosimpint
-#endif
+#include "wx/gdiobj.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/pen.h"
+ #include "wx/brush.h"
+ #include "wx/palette.h"
+ #include "wx/icon.h"
+ #include "wx/iconbndl.h"
+ #include "wx/cursor.h"
+ #include "wx/settings.h"
+ #include "wx/bitmap.h"
+ #include "wx/colour.h"
+ #include "wx/font.h"
+ #include "wx/math.h"
#endif
-#ifdef __WXX11__
-#include "X11/Xlib.h"
+
+IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject)
+
+
+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
+WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
+
+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxPointList)
+
#if wxUSE_EXTENDED_RTTI
#endif
-IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-
wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
{
x = point1.x;
height++;
}
-bool wxRect::operator==(const wxRect& rect) const
-{
- return ((x == rect.x) &&
- (y == rect.y) &&
- (width == rect.width) &&
- (height == rect.height));
-}
-
-wxRect wxRect::operator+(const wxRect& rect) const
-{
- int x1 = wxMin(this->x, rect.x);
- int y1 = wxMin(this->y, rect.y);
- int y2 = wxMax(y+height, rect.height+rect.y);
- int x2 = wxMax(x+width, rect.width+rect.x);
- return wxRect(x1, y1, x2-x1, y2-y1);
-}
-
wxRect& wxRect::Union(const wxRect& rect)
{
// ignore empty rectangles: union with an empty rectangle shouldn't extend
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)
);
}
+bool wxRect::Contains(const wxRect& rect) const
+{
+ return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
+}
+
wxRect& wxRect::Intersect(const wxRect& rect)
{
int x2 = GetRight(),
return r.width != 0;
}
+wxRect& wxRect::operator+=(const wxRect& rect)
+{
+ *this = *this + rect;
+ return *this;
+}
+
+
+wxRect& wxRect::operator*=(const wxRect& rect)
+{
+ *this = *this * rect;
+ return *this;
+}
+
+
+wxRect operator+(const wxRect& r1, const wxRect& r2)
+{
+ int x1 = wxMin(r1.x, r2.x);
+ int y1 = wxMin(r1.y, r2.y);
+ int y2 = wxMax(r1.y+r1.height, r2.height+r2.y);
+ int x2 = wxMax(r1.x+r1.width, r2.width+r2.x);
+ return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+wxRect operator*(const wxRect& r1, const wxRect& r2)
+{
+ int x1 = wxMax(r1.x, r2.x);
+ int y1 = wxMax(r1.y, r2.y);
+ int y2 = wxMin(r1.y+r1.height, r2.height+r2.y);
+ int x2 = wxMin(r1.x+r1.width, r2.width+r2.x);
+ return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
// ============================================================================
// wxColourDatabase
// ============================================================================
{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},
wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
self->Initialize();
- // first look among the existing colours
-
// make the comparaison case insensitive and also match both grey and gray
wxString colName = colour;
colName.MakeUpper();
if ( it != m_map->end() )
return *(it->second);
- // if we didn't find it, query the system, maybe it knows about it
-#if defined(__WXGTK__) || defined(__X__)
- wxColour col = wxColour::CreateByName(colour);
-
- if ( col.Ok() )
- {
- // cache it
- self->AddColour(colour, col);
- }
-
- return col;
-#elif defined(__X__)
- // TODO: move this to wxColour::CreateByName()
- XColor xcolour;
-
-#ifdef __WXMOTIF__
- Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
-#endif
-#ifdef __WXX11__
- Display* display = (Display*) wxGetDisplay();
-#endif
- /* MATTHEW: [4] Use wxGetMainColormap */
- if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))
- return NULL;
-
-#if wxUSE_NANOX
- unsigned char r = (unsigned char)(xcolour.red);
- unsigned char g = (unsigned char)(xcolour.green);
- unsigned char b = (unsigned char)(xcolour.blue);
-#else
- unsigned char r = (unsigned char)(xcolour.red >> 8);
- unsigned char g = (unsigned char)(xcolour.green >> 8);
- unsigned char b = (unsigned char)(xcolour.blue >> 8);
-#endif
-
- wxColour col(r, g, b);
- AddColour(colour, col);
-
- return col;
-#else // other platform
+ // we did not find any result in existing colours:
+ // we won't use wxString -> wxColour conversion because the
+ // wxColour::Set(const wxString &) function which does that conversion
+ // internally uses this function (wxColourDatabase::Find) and we want
+ // to avoid infinite recursion !
return wxNullColour;
-#endif // platforms
}
wxString wxColourDatabase::FindName(const wxColour& colour) const
const wxBrush* wxStockGDI::GetBrush(Item item)
{
- wxBrush* brush = wx_static_cast(wxBrush*, ms_stockObject[item]);
+ wxBrush* brush = static_cast<wxBrush*>(ms_stockObject[item]);
if (brush == NULL)
{
switch (item)
{
case BRUSH_BLACK:
- brush = new wxBrush(*GetColour(COLOUR_BLACK), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_BLUE:
- brush = new wxBrush(*GetColour(COLOUR_BLUE), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_CYAN:
- brush = new wxBrush(*GetColour(COLOUR_CYAN), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_GREEN:
- brush = new wxBrush(*GetColour(COLOUR_GREEN), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_GREY:
- brush = new wxBrush(wxColour(wxT("GREY")), wxSOLID);
+ brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_LIGHTGREY:
- brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_MEDIUMGREY:
- brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxSOLID);
+ brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_RED:
- brush = new wxBrush(*GetColour(COLOUR_RED), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID);
break;
case BRUSH_TRANSPARENT:
- brush = new wxBrush(*GetColour(COLOUR_BLACK), wxTRANSPARENT);
+ brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT);
break;
case BRUSH_WHITE:
- brush = new wxBrush(*GetColour(COLOUR_WHITE), wxSOLID);
+ brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID);
break;
default:
wxFAIL;
const wxColour* wxStockGDI::GetColour(Item item)
{
- wxColour* colour = wx_static_cast(wxColour*, ms_stockObject[item]);
+ wxColour* colour = static_cast<wxColour*>(ms_stockObject[item]);
if (colour == NULL)
{
switch (item)
const wxCursor* wxStockGDI::GetCursor(Item item)
{
- wxCursor* cursor = wx_static_cast(wxCursor*, ms_stockObject[item]);
+ wxCursor* cursor = static_cast<wxCursor*>(ms_stockObject[item]);
if (cursor == NULL)
{
switch (item)
const wxFont* wxStockGDI::GetFont(Item item)
{
- wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+ wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);
if (font == NULL)
{
switch (item)
const wxPen* wxStockGDI::GetPen(Item item)
{
- wxPen* pen = wx_static_cast(wxPen*, ms_stockObject[item]);
+ wxPen* pen = static_cast<wxPen*>(ms_stockObject[item]);
if (pen == NULL)
{
switch (item)
{
case PEN_BLACK:
- pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID);
break;
case PEN_BLACKDASHED:
- pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSHORT_DASH);
+ pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
break;
case PEN_CYAN:
- pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
break;
case PEN_GREEN:
- pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID);
break;
case PEN_GREY:
- pen = new wxPen(wxColour(wxT("GREY")), 1, wxSOLID);
+ pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID);
break;
case PEN_LIGHTGREY:
- pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID);
break;
case PEN_MEDIUMGREY:
- pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxSOLID);
+ pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID);
break;
case PEN_RED:
- pen = new wxPen(*GetColour(COLOUR_RED), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID);
break;
case PEN_TRANSPARENT:
- pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxTRANSPARENT);
+ pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT);
break;
case PEN_WHITE:
- pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxSOLID);
+ pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID);
break;
default:
wxFAIL;
wxTheBrushList = new wxBrushList;
wxThePenList = new wxPenList;
wxTheFontList = new wxFontList;
- wxTheBitmapList = new wxBitmapList;
}
void wxDeleteStockLists()
wxDELETE(wxTheBrushList);
wxDELETE(wxThePenList);
wxDELETE(wxTheFontList);
- wxDELETE(wxTheBitmapList);
+
+ // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()
}
// ============================================================================
// wxTheXXXList stuff (semi-obsolete)
// ============================================================================
-wxBitmapList::~wxBitmapList ()
+wxGDIObjListBase::wxGDIObjListBase()
{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
- {
- wxBitmap *bitmap = (wxBitmap *) node->GetData ();
- wxList::compatibility_iterator next = node->GetNext ();
- if (bitmap->GetVisible())
- delete bitmap;
- node = next;
- }
}
-// Pen and Brush lists
-wxPenList::~wxPenList ()
+wxGDIObjListBase::~wxGDIObjListBase()
{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
+ for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
{
- wxPen *pen = (wxPen *) node->GetData ();
- wxList::compatibility_iterator next = node->GetNext ();
- if (pen->GetVisible())
- delete pen;
- node = next;
+ delete static_cast<wxObject*>(node->GetData());
}
}
-void wxPenList::AddPen (wxPen * pen)
-{
- Append (pen);
-}
-
-void wxPenList::RemovePen (wxPen * pen)
-{
- DeleteObject (pen);
-}
-
-wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
+wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style)
{
- for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())
+ for ( wxList::compatibility_iterator node = list.GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxPen *each_pen = (wxPen *) node->GetData ();
- if (each_pen &&
- each_pen->GetVisible() &&
- each_pen->GetWidth () == width &&
- each_pen->GetStyle () == style &&
- each_pen->GetColour ().Red () == colour.Red () &&
- each_pen->GetColour ().Green () == colour.Green () &&
- each_pen->GetColour ().Blue () == colour.Blue ())
- return each_pen;
+ wxPen * const pen = (wxPen *) node->GetData();
+ if ( pen->GetWidth () == width &&
+ pen->GetStyle () == style &&
+ pen->GetColour() == colour )
+ return pen;
}
- wxPen *pen = new wxPen (colour, width, style);
- if ( !pen->Ok() )
+ wxPen* pen = NULL;
+ wxPen penTmp(colour, width, style);
+ if (penTmp.Ok())
{
- // don't save the invalid pens in the list
- delete pen;
-
- return NULL;
+ pen = new wxPen(penTmp);
+ list.Append(pen);
}
- AddPen(pen);
-
- // we'll delete it ourselves later
- pen->SetVisible(true);
-
return pen;
}
-wxBrushList::~wxBrushList ()
-{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
- {
- wxBrush *brush = (wxBrush *) node->GetData ();
- wxList::compatibility_iterator next = node->GetNext ();
- if (brush && brush->GetVisible())
- delete brush;
- node = next;
- }
-}
-
-void wxBrushList::AddBrush (wxBrush * brush)
-{
- Append (brush);
-}
-
-wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style)
{
- for (wxList::compatibility_iterator node = GetFirst (); node; node = node->GetNext ())
+ for ( wxList::compatibility_iterator node = list.GetFirst();
+ node;
+ node = node->GetNext() )
{
- wxBrush *each_brush = (wxBrush *) node->GetData ();
- if (each_brush &&
- each_brush->GetVisible() &&
- each_brush->GetStyle () == style &&
- each_brush->GetColour ().Red () == colour.Red () &&
- each_brush->GetColour ().Green () == colour.Green () &&
- each_brush->GetColour ().Blue () == colour.Blue ())
- return each_brush;
+ wxBrush * const brush = (wxBrush *) node->GetData ();
+ if ( brush->GetStyle() == style && brush->GetColour() == colour )
+ return brush;
}
- wxBrush *brush = new wxBrush (colour, style);
-
- if ( !brush->Ok() )
+ wxBrush* brush = NULL;
+ wxBrush brushTmp(colour, style);
+ if (brushTmp.Ok())
{
- // don't put the brushes we failed to create into the list
- delete brush;
-
- return NULL;
+ brush = new wxBrush(brushTmp);
+ list.Append(brush);
}
- AddBrush(brush);
-
- // we'll delete it ourselves later
- brush->SetVisible(true);
-
return brush;
}
-void wxBrushList::RemoveBrush (wxBrush * brush)
-{
- DeleteObject (brush);
-}
-
-wxFontList::~wxFontList ()
-{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
- {
- // Only delete objects that are 'visible', i.e.
- // that have been created using FindOrCreate...,
- // where the pointers are expected to be shared
- // (and therefore not deleted by any one part of an app).
- wxFont *font = (wxFont *) node->GetData ();
- wxList::compatibility_iterator next = node->GetNext ();
- if (font->GetVisible())
- delete font;
- node = next;
- }
-}
-
-void wxFontList::AddFont (wxFont * font)
-{
- Append (font);
-}
-
-void wxFontList::RemoveFont (wxFont * font)
-{
- DeleteObject (font);
-}
-
wxFont *wxFontList::FindOrCreateFont(int pointSize,
- int family,
- int style,
- int weight,
+ wxFontFamily family,
+ wxFontStyle style,
+ wxFontWeight weight,
bool underline,
const wxString& facename,
wxFontEncoding encoding)
{
- wxFont *font = (wxFont *)NULL;
+ wxFont *font;
wxList::compatibility_iterator node;
- for ( node = GetFirst(); node; node = node->GetNext() )
+ for (node = list.GetFirst(); node; node = node->GetNext())
{
font = (wxFont *)node->GetData();
- if ( font->GetVisible() &&
- font->Ok() &&
+ if (
font->GetPointSize () == pointSize &&
font->GetStyle () == style &&
font->GetWeight () == weight &&
font->GetUnderlined () == underline )
{
- int fontFamily = font->GetFamily();
+ wxFontFamily fontFamily = (wxFontFamily)font->GetFamily();
#if defined(__WXGTK__)
// under GTK the default family is wxSWISS, so looking for a font
// with wxDEFAULT family should return a wxSWISS one instead of
// creating a new one
bool same = (fontFamily == family) ||
- (fontFamily == wxSWISS && family == wxDEFAULT);
+ (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT);
#else // !GTK
// VZ: but why elsewhere do we require an exact match? mystery...
bool same = fontFamily == family;
}
}
- if ( !node )
+ // font not found, create the new one
+ font = NULL;
+ wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
+ if (fontTmp.Ok())
{
- // font not found, create the new one
- font = new wxFont(pointSize, family, style, weight,
- underline, facename, encoding);
-
- AddFont(font);
-
- // and mark it as being cacheable
- font->SetVisible(true);
+ font = new wxFont(fontTmp);
+ list.Append(font);
}
return font;
}
-void wxBitmapList::AddBitmap(wxBitmap *bitmap)
-{
- Append(bitmap);
-}
-
-void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
-{
- DeleteObject(bitmap);
-}
+#if WXWIN_COMPATIBILITY_2_6
+void wxBrushList::AddBrush(wxBrush*) { }
+void wxBrushList::RemoveBrush(wxBrush*) { }
+void wxFontList::AddFont(wxFont*) { }
+void wxFontList::RemoveFont(wxFont*) { }
+void wxPenList::AddPen(wxPen*) { }
+void wxPenList::RemovePen(wxPen*) { }
+#endif
wxSize wxGetDisplaySize()
{
return wxSize(x, y);
}
+wxSize wxGetDisplayPPI()
+{
+ const wxSize pixels = wxGetDisplaySize();
+ const wxSize mm = wxGetDisplaySizeMM();
+
+ return wxSize((int)((pixels.x * inches2mm) / mm.x),
+ (int)((pixels.y * inches2mm) / mm.y));
+}
+
wxResourceCache::~wxResourceCache ()
{
wxList::compatibility_iterator node = GetFirst ();
projects / wxWidgets.git / blobdiff