// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#endif
#endif
+#ifdef __WXX11__
+#include "X11/Xlib.h"
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#include "wx/mac/uma.h"
+#endif
IMPLEMENT_CLASS(wxColourDatabase, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
wxColourDatabase::~wxColourDatabase ()
{
// Cleanup Colour allocated in Initialize()
- wxNode *node = First ();
+ wxNode *node = GetFirst ();
while (node)
{
- wxColour *col = (wxColour *) node->Data ();
- wxNode *next = node->Next ();
+ wxColour *col = (wxColour *) node->GetData ();
+ wxNode *next = node->GetNext ();
delete col;
node = next;
}
if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
colName2.clear();
- wxNode *node = First();
+ wxNode *node = GetFirst();
while ( node )
{
const wxChar *key = node->GetKeyString();
if ( colName == key || colName2 == key )
{
- return (wxColour *)node->Data();
+ return (wxColour *)node->GetData();
}
- node = node->Next();
+ node = node->GetNext();
}
#ifdef __WXMSW__
#ifdef __WXGTK__
wxColour *col = new wxColour( colour );
- if (!(col->Ok())) {
+ if (!(col->Ok()))
+ {
delete col;
return (wxColour *) NULL;
}
#ifdef __WXMOTIF__
Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
#endif
-#ifdef __XVIEW__
- Xv_Screen screen = xv_get(xview_server, SERVER_NTH_SCREEN, 0);
- Xv_opaque root_window = xv_get(screen, XV_ROOT);
- Display *display = (Display *)xv_get(root_window, XV_DISPLAY);
+#ifdef __WXX11__
+ Display* display = (Display*) wxGetDisplay();
#endif
-
/* MATTHEW: [4] Use wxGetMainColormap */
- if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour,&xcolour))
+ 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 = new wxColour(r, g, b);
Append(colour, col);
unsigned char green = colour.Green ();
unsigned char blue = colour.Blue ();
- for (wxNode * node = First (); node; node = node->Next ())
+ for (wxNode * node = GetFirst (); node; node = node->GetNext ())
{
- wxColour *col = (wxColour *) node->Data ();
+ wxColour *col = (wxColour *) node->GetData ();
if (col->Red () == red && col->Green () == green && col->Blue () == blue)
{
return name;
}
-void wxInitializeStockLists () {
+void wxInitializeStockLists()
+{
wxTheBrushList = new wxBrushList;
wxThePenList = new wxPenList;
wxTheFontList = new wxFontList;
#else
#endif
*/
-#if defined(__WXPM__) || defined(__WXMAC__)
+#if defined(__WXMAC__)
+ int sizeFont = 12;
+
+ Str255 fontName ;
+ SInt16 fontSize ;
+ Style fontStyle ;
+
+ GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ sizeFont = fontSize ;
+ wxSWISS_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
+#elif defined(__WXPM__)
static const int sizeFont = 12;
- wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
#else
- wxNORMAL_FONT = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+ wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
static const int sizeFont = wxNORMAL_FONT->GetPointSize();
#endif
+#if defined(__WXPM__)
+ /*
+ // Basic OS/2 has a fairly limited number of fonts and these are as good
+ // as I can do to get something that looks halfway "wx" normal
+ */
+ wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxBOLD);
+ wxSMALL_FONT = new wxFont (sizeFont - 4, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
+ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+ wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
+#elif defined(__WXMAC__)
+ wxNORMAL_FONT = new wxFont (sizeFont, wxMODERN, wxNORMAL, wxNORMAL);
+ wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
+ GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
+#else
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);
+#endif
wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
wxDELETE(wxCROSS_CURSOR);
}
-void wxDeleteStockLists() {
+void wxDeleteStockLists()
+{
wxDELETE(wxTheBrushList);
wxDELETE(wxThePenList);
wxDELETE(wxTheFontList);
wxDELETE(wxTheBitmapList);
}
-wxBitmapList::wxBitmapList ()
+// ============================================================================
+// wxTheXXXList stuff (semi-obsolete)
+// ============================================================================
+
+wxBitmapList::wxBitmapList()
{
}
wxBitmapList::~wxBitmapList ()
{
- wxNode *node = First ();
+ wxNode *node = GetFirst ();
while (node)
{
- wxBitmap *bitmap = (wxBitmap *) node->Data ();
- wxNode *next = node->Next ();
+ wxBitmap *bitmap = (wxBitmap *) node->GetData ();
+ wxNode *next = node->GetNext ();
if (bitmap->GetVisible())
delete bitmap;
node = next;
// Pen and Brush lists
wxPenList::~wxPenList ()
{
- wxNode *node = First ();
+ wxNode *node = GetFirst ();
while (node)
{
- wxPen *pen = (wxPen *) node->Data ();
- wxNode *next = node->Next ();
+ wxPen *pen = (wxPen *) node->GetData ();
+ wxNode *next = node->GetNext ();
if (pen->GetVisible())
delete pen;
node = next;
wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
{
- for (wxNode * node = First (); node; node = node->Next ())
+ for (wxNode * node = GetFirst (); node; node = node->GetNext ())
{
- wxPen *each_pen = (wxPen *) node->Data ();
+ wxPen *each_pen = (wxPen *) node->GetData ();
if (each_pen &&
each_pen->GetVisible() &&
each_pen->GetWidth () == width &&
return NULL;
}
- // Yes, we can return a pointer to this in a later FindOrCreatePen call,
- // because we created it within FindOrCreatePen. Safeguards against
- // returning a pointer to an automatic variable and hanging on to it
- // (dangling pointer).
+ AddPen(pen);
+
+ // we'll delete it ourselves later
pen->SetVisible(TRUE);
return pen;
wxBrushList::~wxBrushList ()
{
- wxNode *node = First ();
+ wxNode *node = GetFirst ();
while (node)
{
- wxBrush *brush = (wxBrush *) node->Data ();
- wxNode *next = node->Next ();
- if (brush->GetVisible())
+ wxBrush *brush = (wxBrush *) node->GetData ();
+ wxNode *next = node->GetNext ();
+ if (brush && brush->GetVisible())
delete brush;
node = next;
}
wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
{
- for (wxNode * node = First (); node; node = node->Next ())
+ for (wxNode * node = GetFirst (); node; node = node->GetNext ())
{
- wxBrush *each_brush = (wxBrush *) node->Data ();
+ wxBrush *each_brush = (wxBrush *) node->GetData ();
if (each_brush &&
each_brush->GetVisible() &&
each_brush->GetStyle () == style &&
return NULL;
}
+ AddBrush(brush);
+
+ // we'll delete it ourselves later
brush->SetVisible(TRUE);
- // 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).
return brush;
}
wxFontList::~wxFontList ()
{
- wxNode *node = First ();
+ wxNode *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->Data ();
- wxNode *next = node->Next ();
+ wxFont *font = (wxFont *) node->GetData ();
+ wxNode *next = node->GetNext ();
if (font->GetVisible())
delete font;
node = next;
{
wxFont *font = (wxFont *)NULL;
wxNode *node;
- for ( node = First(); node; node = node->Next() )
+ for ( node = GetFirst(); node; node = node->GetNext() )
{
- font = (wxFont *)node->Data();
+ font = (wxFont *)node->GetData();
if ( font->GetVisible() &&
font->Ok() &&
font->GetPointSize () == pointSize &&
font = new wxFont(pointSize, family, style, weight,
underline, facename, encoding);
+ AddFont(font);
+
// and mark it as being cacheable
font->SetVisible(TRUE);
}
wxResourceCache::~wxResourceCache ()
{
- wxNode *node = First ();
+ wxNode *node = GetFirst ();
while (node) {
- wxObject *item = (wxObject *)node->Data();
+ wxObject *item = (wxObject *)node->GetData();
delete item;
- node = node->Next ();
+ node = node->GetNext ();
}
}
projects / wxWidgets.git / blobdiff