#endif
#ifdef __WXMOTIF__
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#endif
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_CLASS(wxColourDatabase, wxList)
- IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
- IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
- IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
- IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
- IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
+IMPLEMENT_CLASS(wxColourDatabase, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
+IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
- IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
{
(height == rect.height));
}
-const wxRect& wxRect::operator += (const wxRect& rect)
+wxRect& wxRect::operator += (const wxRect& rect)
{
- *this = (*this + rect);
- return ( *this ) ;
+ *this = (*this + rect);
+ return ( *this ) ;
}
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);
+ 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);
}
bool wxRect::Inside(int cx, int cy) const
{
- return ( (cx >= x) && (cy >= y)
- && ((cy - y) < height)
- && ((cx - x) < width)
- );
+ return ( (cx >= x) && (cy >= y)
+ && ((cy - y) < height)
+ && ((cx - x) < width)
+ );
}
wxColourDatabase::wxColourDatabase (int type) : wxList (type)
static cdef table[]={
// #ifdef __WXMSW__
- {T("AQUAMARINE"),112, 219, 147},
- {T("BLACK"),0, 0, 0},
- {T("BLUE"), 0, 0, 255},
- {T("BLUE VIOLET"), 159, 95, 159},
- {T("BROWN"), 165, 42, 42},
- {T("CADET BLUE"), 95, 159, 159},
- {T("CORAL"), 255, 127, 0},
- {T("CORNFLOWER BLUE"), 66, 66, 111},
- {T("CYAN"), 0, 255, 255},
- {T("DARK GREY"), 47, 47, 47}, // ?
-
- {T("DARK GREEN"), 47, 79, 47},
- {T("DARK OLIVE GREEN"), 79, 79, 47},
- {T("DARK ORCHID"), 153, 50, 204},
- {T("DARK SLATE BLUE"), 107, 35, 142},
- {T("DARK SLATE GREY"), 47, 79, 79},
- {T("DARK TURQUOISE"), 112, 147, 219},
- {T("DIM GREY"), 84, 84, 84},
- {T("FIREBRICK"), 142, 35, 35},
- {T("FOREST GREEN"), 35, 142, 35},
- {T("GOLD"), 204, 127, 50},
- {T("GOLDENROD"), 219, 219, 112},
- {T("GREY"), 128, 128, 128},
- {T("GREEN"), 0, 255, 0},
- {T("GREEN YELLOW"), 147, 219, 112},
- {T("INDIAN RED"), 79, 47, 47},
- {T("KHAKI"), 159, 159, 95},
- {T("LIGHT BLUE"), 191, 216, 216},
- {T("LIGHT GREY"), 192, 192, 192},
- {T("LIGHT STEEL BLUE"), 143, 143, 188},
- {T("LIME GREEN"), 50, 204, 50},
- {T("LIGHT MAGENTA"), 255, 0, 255},
- {T("MAGENTA"), 255, 0, 255},
- {T("MAROON"), 142, 35, 107},
- {T("MEDIUM AQUAMARINE"), 50, 204, 153},
- {T("MEDIUM GREY"), 100, 100, 100},
- {T("MEDIUM BLUE"), 50, 50, 204},
- {T("MEDIUM FOREST GREEN"), 107, 142, 35},
- {T("MEDIUM GOLDENROD"), 234, 234, 173},
- {T("MEDIUM ORCHID"), 147, 112, 219},
- {T("MEDIUM SEA GREEN"), 66, 111, 66},
- {T("MEDIUM SLATE BLUE"), 127, 0, 255},
- {T("MEDIUM SPRING GREEN"), 127, 255, 0},
- {T("MEDIUM TURQUOISE"), 112, 219, 219},
- {T("MEDIUM VIOLET RED"), 219, 112, 147},
- {T("MIDNIGHT BLUE"), 47, 47, 79},
- {T("NAVY"), 35, 35, 142},
- {T("ORANGE"), 204, 50, 50},
- {T("ORANGE RED"), 255, 0, 127},
- {T("ORCHID"), 219, 112, 219},
- {T("PALE GREEN"), 143, 188, 143},
- {T("PINK"), 188, 143, 234},
- {T("PLUM"), 234, 173, 234},
- {T("PURPLE"), 176, 0, 255},
- {T("RED"), 255, 0, 0},
- {T("SALMON"), 111, 66, 66},
- {T("SEA GREEN"), 35, 142, 107},
- {T("SIENNA"), 142, 107, 35},
- {T("SKY BLUE"), 50, 153, 204},
- {T("SLATE BLUE"), 0, 127, 255},
- {T("SPRING GREEN"), 0, 255, 127},
- {T("STEEL BLUE"), 35, 107, 142},
- {T("TAN"), 219, 147, 112},
- {T("THISTLE"), 216, 191, 216},
- {T("TURQUOISE"), 173, 234, 234},
- {T("VIOLET"), 79, 47, 79},
- {T("VIOLET RED"), 204, 50, 153},
- {T("WHEAT"), 216, 216, 191},
- {T("WHITE"), 255, 255, 255},
- {T("YELLOW"), 255, 255, 0},
- {T("YELLOW GREEN"), 153, 204, 50},
+ {wxT("AQUAMARINE"),112, 219, 147},
+ {wxT("BLACK"),0, 0, 0},
+ {wxT("BLUE"), 0, 0, 255},
+ {wxT("BLUE VIOLET"), 159, 95, 159},
+ {wxT("BROWN"), 165, 42, 42},
+ {wxT("CADET BLUE"), 95, 159, 159},
+ {wxT("CORAL"), 255, 127, 0},
+ {wxT("CORNFLOWER BLUE"), 66, 66, 111},
+ {wxT("CYAN"), 0, 255, 255},
+ {wxT("DARK GREY"), 47, 47, 47}, // ?
+
+ {wxT("DARK GREEN"), 47, 79, 47},
+ {wxT("DARK OLIVE GREEN"), 79, 79, 47},
+ {wxT("DARK ORCHID"), 153, 50, 204},
+ {wxT("DARK SLATE BLUE"), 107, 35, 142},
+ {wxT("DARK SLATE GREY"), 47, 79, 79},
+ {wxT("DARK TURQUOISE"), 112, 147, 219},
+ {wxT("DIM GREY"), 84, 84, 84},
+ {wxT("FIREBRICK"), 142, 35, 35},
+ {wxT("FOREST GREEN"), 35, 142, 35},
+ {wxT("GOLD"), 204, 127, 50},
+ {wxT("GOLDENROD"), 219, 219, 112},
+ {wxT("GREY"), 128, 128, 128},
+ {wxT("GREEN"), 0, 255, 0},
+ {wxT("GREEN YELLOW"), 147, 219, 112},
+ {wxT("INDIAN RED"), 79, 47, 47},
+ {wxT("KHAKI"), 159, 159, 95},
+ {wxT("LIGHT BLUE"), 191, 216, 216},
+ {wxT("LIGHT GREY"), 192, 192, 192},
+ {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
+ {wxT("LIME GREEN"), 50, 204, 50},
+ {wxT("LIGHT MAGENTA"), 255, 0, 255},
+ {wxT("MAGENTA"), 255, 0, 255},
+ {wxT("MAROON"), 142, 35, 107},
+ {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
+ {wxT("MEDIUM GREY"), 100, 100, 100},
+ {wxT("MEDIUM BLUE"), 50, 50, 204},
+ {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+ {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+ {wxT("MEDIUM ORCHID"), 147, 112, 219},
+ {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
+ {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
+ {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
+ {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
+ {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
+ {wxT("MIDNIGHT BLUE"), 47, 47, 79},
+ {wxT("NAVY"), 35, 35, 142},
+ {wxT("ORANGE"), 204, 50, 50},
+ {wxT("ORANGE RED"), 255, 0, 127},
+ {wxT("ORCHID"), 219, 112, 219},
+ {wxT("PALE GREEN"), 143, 188, 143},
+ {wxT("PINK"), 188, 143, 234},
+ {wxT("PLUM"), 234, 173, 234},
+ {wxT("PURPLE"), 176, 0, 255},
+ {wxT("RED"), 255, 0, 0},
+ {wxT("SALMON"), 111, 66, 66},
+ {wxT("SEA GREEN"), 35, 142, 107},
+ {wxT("SIENNA"), 142, 107, 35},
+ {wxT("SKY BLUE"), 50, 153, 204},
+ {wxT("SLATE BLUE"), 0, 127, 255},
+ {wxT("SPRING GREEN"), 0, 255, 127},
+ {wxT("STEEL BLUE"), 35, 107, 142},
+ {wxT("TAN"), 219, 147, 112},
+ {wxT("THISTLE"), 216, 191, 216},
+ {wxT("TURQUOISE"), 173, 234, 234},
+ {wxT("VIOLET"), 79, 47, 79},
+ {wxT("VIOLET RED"), 204, 50, 153},
+ {wxT("WHEAT"), 216, 216, 191},
+ {wxT("WHITE"), 255, 255, 255},
+ {wxT("YELLOW"), 255, 255, 0},
+ {wxT("YELLOW GREEN"), 153, 204, 50},
// #endif
#if defined(__WXGTK__) || defined(__X__)
- {T("MEDIUM GOLDENROD"), 234, 234, 173},
- {T("MEDIUM FOREST GREEN"), 107, 142, 35},
- {T("LIGHT MAGENTA"), 255, 0, 255},
- {T("MEDIUM GREY"), 100, 100, 100},
+ {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+ {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+ {wxT("LIGHT MAGENTA"), 255, 0, 255},
+ {wxT("MEDIUM GREY"), 100, 100, 100},
#endif
{0,0,0,0}
// wxFontPool = new XFontPool;
#endif
- wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
- wxSMALL_FONT = new wxFont (10, wxSWISS, wxNORMAL, wxNORMAL);
- wxITALIC_FONT = new wxFont (12, wxROMAN, wxITALIC, wxNORMAL);
- wxSWISS_FONT = new wxFont (12, wxSWISS, wxNORMAL, wxNORMAL);
+ // why under MSW fonts shouldn't have the standard system size?
+#ifdef __WXMSW__
+ static const int sizeFont = 10;
+#else
+ static const int sizeFont = 12;
+#endif
+
+ wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+ wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
+ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+ wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL);
wxRED_PEN = new wxPen ("RED", 1, wxSOLID);
wxCYAN_PEN = new wxPen ("CYAN", 1, wxSOLID);
wxBitmapList::~wxBitmapList ()
{
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
delete bitmap;
node = next;
}
-#endif
}
// Pen and Brush lists
wxPenList::~wxPenList ()
{
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
delete pen;
node = next;
}
-#endif
}
void wxPenList::AddPen (wxPen * pen)
for (wxNode * node = First (); node; node = node->Next ())
{
wxPen *each_pen = (wxPen *) node->Data ();
- if (each_pen && each_pen->GetVisible() &&
+ if (each_pen &&
+ each_pen->GetVisible() &&
each_pen->GetWidth () == width &&
each_pen->GetStyle () == style &&
each_pen->GetColour ().Red () == colour.Red () &&
// returning a pointer to an automatic variable and hanging on to it
// (dangling pointer).
pen->SetVisible(TRUE);
+
return pen;
}
wxBrushList::~wxBrushList ()
{
-#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
delete brush;
node = next;
}
-#endif
}
void wxBrushList::AddBrush (wxBrush * brush)
for (wxNode * node = First (); node; node = node->Next ())
{
wxBrush *each_brush = (wxBrush *) node->Data ();
- if (each_brush && each_brush->GetVisible() &&
+ 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;
}
+
// Yes, we can return a pointer to this in a later FindOrCreateBrush call,
// because we created it within FindOrCreateBrush. Safeguards against
// returning a pointer to an automatic variable and hanging on to it
// (dangling pointer).
wxBrush *brush = new wxBrush (colour, style);
+
brush->SetVisible(TRUE);
+
return brush;
}
wxFontList::~wxFontList ()
{
- wxNode *node = First ();
- while (node)
+ wxNode *node = First ();
+ 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->Data ();
- wxNode *next = node->Next ();
- if (font->GetVisible())
- delete font;
- node = next;
-}
+ // 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->Data ();
+ wxNode *next = node->Next ();
+ if (font->GetVisible())
+ delete font;
+ node = next;
+ }
}
void wxFontList::AddFont (wxFont * font)
}
wxFont *wxFontList::
- FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)
+ FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face, wxFontEncoding encoding)
{
for (wxNode * node = First (); node; node = node->Next ())
{
wxFont *each_font = (wxFont *) node->Data ();
- if (each_font && each_font->GetVisible() && each_font->Ok() &&
+ if (each_font &&
+ each_font->GetVisible() &&
+ each_font->Ok() &&
each_font->GetPointSize () == PointSize &&
each_font->GetStyle () == Style &&
each_font->GetWeight () == Weight &&
each_font->GetUnderlined () == underline &&
- //#if defined(__X__)
- // each_font->GetFontId () == FamilyOrFontId) /* New font system */
- //#else
#if defined(__WXGTK__)
(each_font->GetFamily() == FamilyOrFontId ||
- (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&
+ (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&
#else
each_font->GetFamily() == FamilyOrFontId &&
#endif
- ((each_font->GetFaceName() == T("")) || each_font->GetFaceName() == Face))
- //#endif
+ ((each_font->GetFaceName() == wxT("")) || each_font->GetFaceName() == Face) &&
+ (encoding == wxFONTENCODING_DEFAULT || each_font->GetEncoding() == encoding))
return each_font;
}
- wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
+ wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face, encoding);
+
font->SetVisible(TRUE);
+
return font;
}
projects / wxWidgets.git / blobdiff