#pragma hdrstop
#endif
+
#include "wx/gdicmn.h"
#include "wx/brush.h"
#include "wx/pen.h"
#include "wx/cursor.h"
#include "wx/font.h"
#include "wx/palette.h"
+#include "wx/app.h"
+#include "wx/log.h"
#include <string.h>
#ifdef __WXMSW__
#include <windows.h>
#endif
+#ifdef __WXMOTIF__
+#include <Xm/Xm.h>
+#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_DYNAMIC_CLASS(wxRect, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
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();
else return NULL;
#endif
+// TODO for other implementations. This should really go into
+// platform-specific directories.
+#ifdef __WXSTUBS__
+ else return NULL;
+#endif
+
#ifdef __WXGTK__
else {
wxColour *col = new wxColour( colour );
if (!(col->Ok())) {
delete col;
- return NULL;
+ return (wxColour *) NULL;
}
Append( colour, col );
return col;
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);
#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);
if (col->Red () == red && col->Green () == green && col->Blue () == blue)
{
- char *found = node->key.string;
+ const char *found = node->GetKeyString();
if (found)
return wxString(found);
}
}
-void
-wxInitializeStockObjects ()
-{
+void wxInitializeStockLists () {
wxTheBrushList = new wxBrushList;
wxThePenList = new wxPenList;
wxTheFontList = new wxFontList;
wxTheBitmapList = new wxBitmapList;
+}
+void wxInitializeStockObjects ()
+{
#ifdef __WXMOTIF__
#endif
#ifdef __X__
- wxFontPool = new XFontPool;
+ // TODO
+ // wxFontPool = new XFontPool;
#endif
wxNORMAL_FONT = new wxFont (12, wxMODERN, wxNORMAL, wxNORMAL);
void
wxDeleteStockObjects ()
{
- DELETEP(wxNORMAL_FONT);
- DELETEP(wxSMALL_FONT);
- DELETEP(wxITALIC_FONT);
- DELETEP(wxSWISS_FONT);
-
- DELETEP(wxRED_PEN);
- DELETEP(wxCYAN_PEN);
- DELETEP(wxGREEN_PEN);
- DELETEP(wxBLACK_PEN);
- DELETEP(wxWHITE_PEN);
- DELETEP(wxTRANSPARENT_PEN);
- DELETEP(wxBLACK_DASHED_PEN);
- DELETEP(wxGREY_PEN);
- DELETEP(wxMEDIUM_GREY_PEN);
- DELETEP(wxLIGHT_GREY_PEN);
-
- DELETEP(wxBLUE_BRUSH);
- DELETEP(wxGREEN_BRUSH);
- DELETEP(wxWHITE_BRUSH);
- DELETEP(wxBLACK_BRUSH);
- DELETEP(wxTRANSPARENT_BRUSH);
- DELETEP(wxCYAN_BRUSH);
- DELETEP(wxRED_BRUSH);
- DELETEP(wxGREY_BRUSH);
- DELETEP(wxMEDIUM_GREY_BRUSH);
- DELETEP(wxLIGHT_GREY_BRUSH);
-
- DELETEP(wxBLACK);
- DELETEP(wxWHITE);
- DELETEP(wxRED);
- DELETEP(wxBLUE);
- DELETEP(wxGREEN);
- DELETEP(wxCYAN);
- DELETEP(wxLIGHT_GREY);
-
- DELETEP(wxSTANDARD_CURSOR);
- DELETEP(wxHOURGLASS_CURSOR);
- DELETEP(wxCROSS_CURSOR);
+ wxDELETE(wxNORMAL_FONT);
+ wxDELETE(wxSMALL_FONT);
+ wxDELETE(wxITALIC_FONT);
+ wxDELETE(wxSWISS_FONT);
+
+ wxDELETE(wxRED_PEN);
+ wxDELETE(wxCYAN_PEN);
+ wxDELETE(wxGREEN_PEN);
+ wxDELETE(wxBLACK_PEN);
+ wxDELETE(wxWHITE_PEN);
+ wxDELETE(wxTRANSPARENT_PEN);
+ wxDELETE(wxBLACK_DASHED_PEN);
+ wxDELETE(wxGREY_PEN);
+ wxDELETE(wxMEDIUM_GREY_PEN);
+ wxDELETE(wxLIGHT_GREY_PEN);
+
+ wxDELETE(wxBLUE_BRUSH);
+ wxDELETE(wxGREEN_BRUSH);
+ wxDELETE(wxWHITE_BRUSH);
+ wxDELETE(wxBLACK_BRUSH);
+ wxDELETE(wxTRANSPARENT_BRUSH);
+ wxDELETE(wxCYAN_BRUSH);
+ wxDELETE(wxRED_BRUSH);
+ wxDELETE(wxGREY_BRUSH);
+ wxDELETE(wxMEDIUM_GREY_BRUSH);
+ wxDELETE(wxLIGHT_GREY_BRUSH);
+
+ wxDELETE(wxBLACK);
+ wxDELETE(wxWHITE);
+ wxDELETE(wxRED);
+ wxDELETE(wxBLUE);
+ wxDELETE(wxGREEN);
+ wxDELETE(wxCYAN);
+ wxDELETE(wxLIGHT_GREY);
+
+ wxDELETE(wxSTANDARD_CURSOR);
+ wxDELETE(wxHOURGLASS_CURSOR);
+ wxDELETE(wxCROSS_CURSOR);
+}
+
+void wxDeleteStockLists() {
+ wxDELETE(wxTheBrushList);
+ wxDELETE(wxThePenList);
+ wxDELETE(wxTheFontList);
+ wxDELETE(wxTheBitmapList);
}
wxBitmapList::wxBitmapList ()
wxBitmapList::~wxBitmapList ()
{
+#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
wxBitmap *bitmap = (wxBitmap *) node->Data ();
wxNode *next = node->Next ();
- delete bitmap;
-// bitmap->FreeResource(TRUE);
+ if (bitmap->GetVisible())
+ delete bitmap;
node = next;
}
+#endif
}
// Pen and Brush lists
wxPenList::~wxPenList ()
{
+#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
wxPen *pen = (wxPen *) node->Data ();
wxNode *next = node->Next ();
- delete pen;
-// pen->FreeResource(TRUE);
+ if (pen->GetVisible())
+ delete pen;
node = next;
}
+#endif
}
void wxPenList::AddPen (wxPen * pen)
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 NULL;
-}
-
wxBrushList::~wxBrushList ()
{
+#if defined(__WXMSW__) || defined(__WXMOTIF__)
wxNode *node = First ();
while (node)
{
wxBrush *brush = (wxBrush *) node->Data ();
wxNode *next = node->Next ();
- delete brush;
+ if (brush->GetVisible())
+ delete brush;
node = next;
}
+#endif
}
void wxBrushList::AddBrush (wxBrush * brush)
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 NULL;
-}
-
void wxBrushList::RemoveBrush (wxBrush * brush)
{
DeleteObject (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).
wxFont *font = (wxFont *) node->Data ();
wxNode *next = node->Next ();
- delete font;
+ if (font->GetVisible())
+ delete font;
node = next;
-*/
- // New for 2.0: don't delete the font (it may be a member
- // of a wxDC, for example)
- wxFont *font = (wxFont *) node->Data ();
- wxNode *next = node->Next ();
-
- // Force the font to be deleted
- font->FreeResource(TRUE);
- node = next;
- }
-#endif
+}
}
void wxFontList::AddFont (wxFont * font)
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
+ //#if defined(__X__)
+ // each_font->GetFontId () == FamilyOrFontId) /* New font system */
+ //#else
each_font->GetFamily () == FamilyOrFontId &&
(!each_font->GetFaceName() || each_font->GetFaceName() == Face))
-#endif
+ //#endif
return each_font;
}
wxFont *font = new wxFont (PointSize, FamilyOrFontId, Style, Weight, underline, Face);
return wxSize(x, y);
}
+wxResourceCache::~wxResourceCache () {
+ wxNode *node = First ();
+ while (node) {
+ wxGDIObject *item = (wxGDIObject *)node->Data();
+ if (item->IsKindOf(CLASSINFO(wxBrush))) {
+ wxBrush *brush = (wxBrush *)item;
+ delete brush;
+ }
+
+ if (item->IsKindOf(CLASSINFO(wxFont))) {
+ wxFont *font = (wxFont *)item;
+ delete font;
+ }
+
+ if (item->IsKindOf(CLASSINFO(wxBitmap))) {
+ wxBitmap *bitmap = (wxBitmap *)item;
+ delete bitmap;
+ }
+
+ if (item->IsKindOf(CLASSINFO(wxColour))) {
+ wxColour *colour = (wxColour *)item;
+ delete colour;
+ }
+
+ wxNode *next = node->Next ();
+ node = next;
+ }
+}
+
projects / wxWidgets.git / blobdiff