X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..5dcf05ae082a2da39102dec13ab3ad4c483221c8:/src/common/gdicmn.cpp diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index 4bb0019e0d..34df0496ce 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -29,6 +29,7 @@ #include "wx/cursor.h" #include "wx/font.h" #include "wx/palette.h" +#include "wx/app.h" #include "wx/log.h" #include @@ -37,6 +38,10 @@ #include #endif +#ifdef __WXMOTIF__ +#include +#endif + #if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxColourDatabase, wxList) IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList) @@ -67,13 +72,13 @@ wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight) y = topLeft.y; width = bottomRight.x - topLeft.x; height = bottomRight.y - topLeft.y; - + if (width < 0) { width = -width; x -= width; } - + if (height < 0) { height = -height; @@ -89,9 +94,9 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size) wxRect::wxRect(const wxRect& rect) { - x = rect.x; - y = rect.y; - width = rect.width; + x = rect.x; + y = rect.y; + width = rect.width; height = rect.height; } @@ -141,14 +146,14 @@ void wxColourDatabase::Initialize () // Don't initialize for X: colours are found // in FindColour below. // Added: Not all - + struct cdef { char *name; int r,g,b; }; cdef cc; static cdef table[]={ - + // #ifdef __WXMSW__ {"AQUAMARINE",112, 219, 147}, {"BLACK",0, 0, 0}, @@ -229,7 +234,7 @@ void wxColourDatabase::Initialize () {"LIGHT MAGENTA", 255, 0, 255}, {"MEDIUM GREY", 100, 100, 100}, #endif - + {0,0,0,0} }; int i; @@ -251,10 +256,14 @@ void wxColourDatabase::Initialize () wxColour *wxColourDatabase::FindColour(const wxString& colour) { - wxNode *node = Find((char *) (const char *)colour); + // VZ: make the comparaison case insensitive + wxString str = colour; + str.MakeUpper(); + + wxNode *node = Find(str); if (node) return (wxColour *)node->Data(); - + #ifdef __WXMSW__ else return NULL; #endif @@ -268,7 +277,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #ifdef __WXGTK__ else { wxColour *col = new wxColour( colour ); - + if (!(col->Ok())) { delete col; return (wxColour *) NULL; @@ -283,7 +292,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) XColor xcolour; #ifdef __WXMOTIF__ - Display *display = XtDisplay(wxTheApp->topLevel) ; + Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ; #endif #ifdef __XVIEW__ Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0); @@ -292,7 +301,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour) #endif /* MATTHEW: [4] Use wxGetMainColormap */ - if (!XParseColor(display, wxGetMainColormap(display), colour,&xcolour)) + if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour)) return NULL; unsigned char r = (unsigned char)(xcolour.red >> 8); @@ -312,19 +321,19 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const unsigned char red = colour.Red (); unsigned char green = colour.Green (); unsigned char blue = colour.Blue (); - + for (wxNode * node = First (); node; node = node->Next ()) { wxColour *col = (wxColour *) node->Data (); - + if (col->Red () == red && col->Green () == green && col->Blue () == blue) - { - char *found = node->key.string; - if (found) - return wxString(found); - } + { + const char *found = node->GetKeyString(); + if (found) + return wxString(found); + } } - return wxString(""); // Not Found + return wxString(""); // Not Found } @@ -340,7 +349,8 @@ void wxInitializeStockObjects () #ifdef __WXMOTIF__ #endif #ifdef __X__ - wxFontPool = new XFontPool; + // TODO + // wxFontPool = new XFontPool; #endif wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL); @@ -383,8 +393,7 @@ void wxInitializeStockObjects () wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS); } -void -wxDeleteStockObjects () +void wxDeleteStockObjects () { wxDELETE(wxNORMAL_FONT); wxDELETE(wxSMALL_FONT); @@ -439,9 +448,7 @@ wxBitmapList::wxBitmapList () wxBitmapList::~wxBitmapList () { - wxLogDebug("~wxBitmapList: count = %d", Number()); -#ifdef __WXMSW__ - +#if defined(__WXMSW__) || defined(__WXMOTIF__) wxNode *node = First (); while (node) { @@ -457,7 +464,7 @@ wxBitmapList::~wxBitmapList () // Pen and Brush lists wxPenList::~wxPenList () { -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXMOTIF__) wxNode *node = First (); while (node) { @@ -486,12 +493,12 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) { wxPen *each_pen = (wxPen *) node->Data (); 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; + 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 *pen = new wxPen (colour, width, style); @@ -503,18 +510,9 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style) return pen; } -wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style) -{ - wxColour *the_colour = wxTheColourDatabase->FindColour (colour); - if (the_colour) - return FindOrCreatePen (*the_colour, width, style); - else - return (wxPen *) NULL; -} - wxBrushList::~wxBrushList () { -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXMOTIF__) wxNode *node = First (); while (node) { @@ -538,11 +536,11 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) { wxBrush *each_brush = (wxBrush *) node->Data (); 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; + 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 @@ -553,15 +551,6 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style) return brush; } -wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style) -{ - wxColour *the_colour = wxTheColourDatabase->FindColour (colour); - if (the_colour) - return FindOrCreateBrush (*the_colour, style); - else - return (wxBrush *) NULL; -} - void wxBrushList::RemoveBrush (wxBrush * brush) { DeleteObject (brush); @@ -569,21 +558,19 @@ void wxBrushList::RemoveBrush (wxBrush * brush) wxFontList::~wxFontList () { -#ifdef __WXMSW__ 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). + // 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; + if (font->GetVisible()) + delete font; node = next; } -#endif } void wxFontList::AddFont (wxFont * font) @@ -597,23 +584,23 @@ void wxFontList::RemoveFont (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) { for (wxNode * node = First (); node; node = node->Next ()) { wxFont *each_font = (wxFont *) node->Data (); 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__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW) - each_font->GetFontId () == FamilyOrFontId) /* New font system */ -#else - each_font->GetFamily () == FamilyOrFontId && + 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 + each_font->GetFamily () == FamilyOrFontId && (!each_font->GetFaceName() || each_font->GetFaceName() == Face)) -#endif - return each_font; + //#endif + return each_font; } wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face); font->SetVisible(TRUE); @@ -621,9 +608,14 @@ wxFont *wxFontList:: } void wxBitmapList::AddBitmap(wxBitmap *bitmap) -{ Append(bitmap); } +{ + Append(bitmap); +} + void wxBitmapList::RemoveBitmap(wxBitmap *bitmap) -{ DeleteObject(bitmap); } +{ + DeleteObject(bitmap); +} wxSize wxGetDisplaySize() { @@ -632,13 +624,8 @@ wxSize wxGetDisplaySize() return wxSize(x, y); } -wxResourceCache::wxResourceCache () : wxList() { -} - -wxResourceCache::wxResourceCache (const unsigned int the_key_type) : wxList(the_key_type) { -} - -wxResourceCache::~wxResourceCache () { +wxResourceCache::~wxResourceCache () +{ wxNode *node = First (); while (node) { wxGDIObject *item = (wxGDIObject *)node->Data();