// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "gdicmn.h"
#endif
#include "wx/log.h"
#include <string.h>
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
#include "wx/msw/wrapwin.h"
#endif
#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)
-//IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-//IMPLEMENT_DYNAMIC_CLASS(wxResourceCache, wxList)
-IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+#if wxUSE_EXTENDED_RTTI
+
+// wxPoint
+
+template<> void wxStringReadValue(const wxString &s , wxPoint &data )
+{
+ wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
+}
-wxRect::wxRect(const wxPoint& topLeft, const wxPoint& bottomRight)
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
{
- x = topLeft.x;
- y = topLeft.y;
- width = bottomRight.x - topLeft.x + 1;
- height = bottomRight.y - topLeft.y + 1;
+ s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
+}
- if (width < 0)
- {
- width = -width;
- x -= width;
- }
+wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
- if (height < 0)
- {
- height = -height;
- y -= height;
- }
+template<> void wxStringReadValue(const wxString &s , wxSize &data )
+{
+ wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
}
-wxRect::wxRect(const wxPoint& point, const wxSize& size)
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )
{
- x = point.x; y = point.y;
- width = size.x; height = size.y;
+ s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
}
-bool wxRect::operator==(const wxRect& rect) const
+wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
+
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+
+wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
{
- return ((x == rect.x) &&
- (y == rect.y) &&
- (width == rect.width) &&
- (height == rect.height));
+ x = point1.x;
+ y = point1.y;
+ width = point2.x - point1.x;
+ height = point2.y - point1.y;
+
+ if (width < 0)
+ {
+ width = -width;
+ x = point2.x;
+ }
+ width++;
+
+ if (height < 0)
+ {
+ height = -height;
+ y = point2.y;
+ }
+ height++;
}
-wxRect& wxRect::operator += (const wxRect& rect)
+bool wxRect::operator==(const wxRect& rect) const
{
- *this = (*this + rect);
- return ( *this ) ;
+ return ((x == rect.x) &&
+ (y == rect.y) &&
+ (width == rect.width) &&
+ (height == rect.height));
}
-wxRect wxRect::operator + (const wxRect& rect) const
+wxRect wxRect::operator+(const wxRect& rect) const
{
int x1 = wxMin(this->x, rect.x);
int y1 = wxMin(this->y, rect.y);
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
+ // this one to (0, 0)
+ if ( !width || !height )
+ {
+ *this = rect;
+ }
+ else if ( rect.width && rect.height )
+ {
+ int x1 = wxMin(x, rect.x);
+ int y1 = wxMin(y, rect.y);
+ int y2 = wxMax(y + height, rect.height + rect.y);
+ int x2 = wxMax(x + width, rect.width + rect.x);
+
+ x = x1;
+ y = y1;
+ width = x2 - x1;
+ height = y2 - y1;
+ }
+ //else: we're not empty and rect is empty
+
+ return *this;
+}
+
wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
{
x -= dx;
return r.width != 0;
}
-WX_DECLARE_STRING_HASH_MAP( wxColour*, wxStringToColourHashMap );
+// ============================================================================
+// wxColourDatabase
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourDatabase ctor/dtor
+// ----------------------------------------------------------------------------
wxColourDatabase::wxColourDatabase ()
{
- m_map = new wxStringToColourHashMap;
+ // will be created on demand in Initialize()
+ m_map = NULL;
}
wxColourDatabase::~wxColourDatabase ()
{
- WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+ if ( m_map )
+ {
+ WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+
+ delete m_map;
+ }
- delete m_map;
- m_map = NULL;
#ifdef __WXPM__
delete [] m_palTable;
#endif
}
// Colour database stuff
-void wxColourDatabase::Initialize ()
+void wxColourDatabase::Initialize()
{
- // these colour definitions are taken from X consortium definitions with a
- // few more colours added
+ if ( m_map )
+ {
+ // already initialized
+ return;
+ }
+
+ m_map = new wxStringToColourHashMap;
+
static const struct wxColourDesc
{
const wxChar *name;
- int r,g,b;
+ unsigned char r,g,b;
}
wxColourTable[] =
{
- {wxT("AQUAMARINE"),127, 255, 212},
+ {wxT("AQUAMARINE"),112, 219, 147},
{wxT("BLACK"),0, 0, 0},
{wxT("BLUE"), 0, 0, 255},
- {wxT("BLUE VIOLET"), 138, 43, 226},
+ {wxT("BLUE VIOLET"), 159, 95, 159},
{wxT("BROWN"), 165, 42, 42},
- {wxT("CADET BLUE"), 95, 158, 160},
- {wxT("CORAL"), 255, 127, 80},
- {wxT("CORNFLOWER BLUE"), 100, 149, 237},
+ {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"), 169, 169, 169},
- {wxT("DARK GREEN"), 0, 100, 0},
- {wxT("DARK OLIVE GREEN"), 85, 107, 47},
+ {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"), 72, 61, 139},
+ {wxT("DARK SLATE BLUE"), 107, 35, 142},
{wxT("DARK SLATE GREY"), 47, 79, 79},
- {wxT("DARK TURQUOISE"), 0, 206, 209},
- {wxT("DIM GREY"), 105, 105, 105},
- {wxT("FIREBRICK"), 178, 34, 34},
- {wxT("FOREST GREEN"), 34, 139, 34},
- {wxT("GOLD"), 255, 215, 0},
- {wxT("GOLDENROD"), 218, 165, 32},
- {wxT("GREY"), 190, 190, 190},
+ {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"), 173, 255, 47},
- {wxT("INDIAN RED"), 205, 92, 92},
- {wxT("KHAKI"), 240, 230, 140},
- {wxT("LIGHT BLUE"), 173, 216, 230},
- {wxT("LIGHT GREY"), 211, 211, 211},
- {wxT("LIGHT STEEL BLUE"), 176, 196, 222},
- {wxT("LIME GREEN"), 50, 205, 50},
- {wxT("LIGHT MAGENTA"), 255, 0, 255}, // not X colour
+ {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"), 176, 48, 96},
- {wxT("MEDIUM AQUAMARINE"), 102, 205, 170},
- {wxT("MEDIUM BLUE"), 0, 0, 205},
- {wxT("MEDIUM FOREST GREEN"), 107, 142, 35}, // not X colour
- {wxT("MEDIUM GOLD"), 204, 127, 50}, // not X, "GOLD" in 2.4
- {wxT("MEDIUM GOLDENROD"), 234, 234, 173}, // not X colour
- {wxT("MEDIUM GREY"), 100, 100, 100}, // not X colour
- {wxT("MEDIUM ORANGE"), 204, 50, 50}, // not X, "ORANGE" in 2.4
- {wxT("MEDIUM ORCHID"), 186, 85, 211},
- {wxT("MEDIUM SEA GREEN"), 60, 179, 113},
- {wxT("MEDIUM SLATE BLUE"), 123, 104, 238},
- {wxT("MEDIUM SPRING GREEN"), 0, 250, 154},
- {wxT("MEDIUM TURQUOISE"), 72, 209, 204},
- {wxT("MEDIUM VIOLET RED"), 199, 21, 133},
- {wxT("MIDNIGHT BLUE"), 25, 25, 112},
- {wxT("NAVY"), 0, 0, 128},
- {wxT("ORANGE"), 255, 165, 0},
- {wxT("ORANGE RED"), 255, 69, 0},
- {wxT("ORCHID"), 218, 112, 214},
- {wxT("PALE GREEN"), 152, 251, 152},
- {wxT("PINK"), 255, 192, 203},
- {wxT("PLUM"), 221, 160, 221},
- {wxT("PURPLE"), 160, 32, 240},
+ {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"), 250, 128, 114},
- {wxT("SEA GREEN"), 46, 139, 87},
- {wxT("SIENNA"), 160, 82, 45},
- {wxT("SKY BLUE"), 135, 206, 235},
- {wxT("SLATE BLUE"), 106, 90, 205},
+ {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"), 70, 130, 180},
- {wxT("TAN"), 210, 180, 140},
+ {wxT("STEEL BLUE"), 35, 107, 142},
+ {wxT("TAN"), 219, 147, 112},
{wxT("THISTLE"), 216, 191, 216},
- {wxT("TURQUOISE"), 64, 224, 208},
- {wxT("VIOLET"), 238, 130, 238},
- {wxT("VIOLET RED"), 208, 32, 144},
- {wxT("WHEAT"), 245, 222, 179},
+ {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"), 154, 205, 50},
+ {wxT("YELLOW GREEN"), 153, 204, 50}
};
- size_t n;
+ size_t n;
for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
{
const wxColourDesc& cc = wxColourTable[n];
- AddColour(cc.name, new wxColour(cc.r,cc.g,cc.b));
+ (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b);
}
+
#ifdef __WXPM__
m_palTable = new long[n];
for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
#endif
}
-/*
- * Changed by Ian Brown, July 1994.
- *
- * When running under X, the Colour Database starts off empty. The X server
- * is queried for the colour first time after which it is entered into the
- * database. This allows our client to use the server colour database which
- * is hopefully gamma corrected for the display being used.
- */
+// ----------------------------------------------------------------------------
+// wxColourDatabase operations
+// ----------------------------------------------------------------------------
-wxColour *wxColourDatabase::FindColour(const wxString& colour)
+void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
{
- return FindColour(colour, true);
-}
-
-wxColour *wxColourDatabase::FindColourNoAdd(const wxString& colour) const
-{
- return ((wxColourDatabase*)this)->FindColour(colour, false);
-}
+ Initialize();
-void wxColourDatabase::AddColour (const wxString& name, wxColour* colour)
-{
+ // canonicalize the colour names before using them as keys: they should be
+ // in upper case
wxString colName = name;
colName.MakeUpper();
- wxString colName2 = colName;
- if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
- colName2.clear();
+
+ // ... and we also allow both grey/gray
+ wxString colNameAlt = colName;
+ if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+ {
+ // but in this case it is not necessary so avoid extra search below
+ colNameAlt.clear();
+ }
wxStringToColourHashMap::iterator it = m_map->find(colName);
- if ( it == m_map->end() )
- it = m_map->find(colName2);
+ if ( it == m_map->end() && !colNameAlt.empty() )
+ it = m_map->find(colNameAlt);
if ( it != m_map->end() )
{
- delete it->second;
- it->second = colour;
+ *(it->second) = colour;
+ }
+ else // new colour
+ {
+ (*m_map)[colName] = new wxColour(colour);
}
-
- (*m_map)[name] = colour;
}
-wxColour *wxColourDatabase::FindColour(const wxString& colour, bool add)
+wxColour wxColourDatabase::Find(const wxString& colour) const
{
- // VZ: make the comparaison case insensitive and also match both grey and
- // gray
+ 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();
- wxString colName2 = colName;
- if ( !colName2.Replace(_T("GRAY"), _T("GREY")) )
- colName2.clear();
+ wxString colNameAlt = colName;
+ if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+ colNameAlt.clear();
wxStringToColourHashMap::iterator it = m_map->find(colName);
- if ( it == m_map->end() )
- it = m_map->find(colName2);
+ if ( it == m_map->end() && !colNameAlt.empty() )
+ it = m_map->find(colNameAlt);
if ( it != m_map->end() )
- return it->second;
-
- if ( !add )
- return NULL;
-
-#ifdef __WXMSW__
- return NULL;
-#endif
-#ifdef __WXPM__
- return NULL;
-#endif
-#ifdef __WXMGL__
- return NULL;
-#endif
-
-// TODO for other implementations. This should really go into
-// platform-specific directories.
-#ifdef __WXMAC__
- return NULL;
-#endif
-#ifdef __WXCOCOA__
- return NULL;
-#endif
-#ifdef __WXSTUBS__
- return NULL;
-#endif
+ return *(it->second);
-#ifdef __WXGTK__
- wxColour *col = new wxColour( colour );
+ // 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()))
- {
- delete col;
- return (wxColour *) NULL;
- }
- AddColour(colour, col);
- return col;
-#endif
+ if ( col.Ok() )
+ {
+ // cache it
+ self->AddColour(colour, col);
+ }
-#ifdef __X__
+ return col;
+#elif defined(__X__)
+ // TODO: move this to wxColour::CreateByName()
XColor xcolour;
#ifdef __WXMOTIF__
#endif
/* MATTHEW: [4] Use wxGetMainColormap */
if (!XParseColor(display, (Colormap) wxTheApp->GetMainColormap((WXDisplay*) display), colour.ToAscii() ,&xcolour))
- return NULL;
+ return NULL;
#if wxUSE_NANOX
unsigned char r = (unsigned char)(xcolour.red);
unsigned char b = (unsigned char)(xcolour.blue >> 8);
#endif
- wxColour *col = new wxColour(r, g, b);
+ wxColour col(r, g, b);
AddColour(colour, col);
return col;
-#endif // __X__
+#else // other platform
+ return wxNullColour;
+#endif // platforms
}
-wxString wxColourDatabase::FindName (const wxColour& colour) const
+wxString wxColourDatabase::FindName(const wxColour& colour) const
{
- unsigned char red = colour.Red ();
- unsigned char green = colour.Green ();
- unsigned char blue = colour.Blue ();
+ wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+ self->Initialize();
typedef wxStringToColourHashMap::iterator iterator;
- for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
+ for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
{
- wxColour *col = it->second;
-
- if (col->Red () == red && col->Green () == green && col->Blue () == blue)
+ if ( *(it->second) == colour )
return it->first;
}
return wxEmptyString;
}
+// ----------------------------------------------------------------------------
+// deprecated wxColourDatabase methods
+// ----------------------------------------------------------------------------
+
+wxColour *wxColourDatabase::FindColour(const wxString& name)
+{
+ // This function is deprecated, use Find() instead.
+ // Formerly this function sometimes would return a deletable pointer and
+ // sometimes a non-deletable one (when returning a colour from the database).
+ // Trying to delete the latter anyway results in problems, so probably
+ // nobody ever freed the pointers. Currently it always returns a new
+ // instance, which means there will be memory leaks.
+ wxLogDebug(wxT("wxColourDataBase::FindColour():")
+ wxT(" Please use wxColourDataBase::Find() instead"));
+
+ // using a static variable here is not the most elegant solution but unless
+ // we want to make wxStringToColourHashMap public (i.e. move it to the
+ // header) so that we could have a member function returning
+ // wxStringToColourHashMap::iterator, there is really no good way to do it
+ // otherwise
+ //
+ // and knowing that this function is going to disappear in the next release
+ // anyhow I don't want to waste time on this
+
+ static wxColour s_col;
+
+ s_col = Find(name);
+ if ( !s_col.Ok() )
+ return NULL;
+
+ return new wxColour(s_col);
+}
+
+// ============================================================================
+// stock objects
+// ============================================================================
+
void wxInitializeStockLists()
{
wxTheColourDatabase = new wxColourDatabase;
- wxTheColourDatabase->Initialize();
wxTheBrushList = new wxBrushList;
wxThePenList = new wxPenList;
#endif
*/
#if defined(__WXMAC__)
+ // retrieve size of system font for all stock fonts
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) );
+ GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+ sizeFont = fontSize ;
+#ifdef __WXMAC_CLASSIC__
+ wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
+#else
+ wxNORMAL_FONT = new wxFont () ;
+ wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont );
+#endif
#elif defined(__WXPM__)
- static const int sizeFont = 12;
+ static const int sizeFont = 12;
#else
- wxNORMAL_FONT = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- static const int sizeFont = wxNORMAL_FONT->GetPointSize();
+ 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 */
+ /*
+ // 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);
+ wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
- GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+#ifdef __WXMAC_CLASSIC__
+ 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);
+ wxSMALL_FONT = new wxFont () ;
+ wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont );
+#endif
+#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);
- wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
- wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
- wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
- wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
- wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
- wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
- wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
- wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
-
- wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
- wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
- wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
- wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
- wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
- wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
- wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
- wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
- wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
- wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
-
- wxBLACK = new wxColour (wxT("BLACK"));
- wxWHITE = new wxColour (wxT("WHITE"));
- wxRED = new wxColour (wxT("RED"));
- wxBLUE = new wxColour (wxT("BLUE"));
- wxGREEN = new wxColour (wxT("GREEN"));
- wxCYAN = new wxColour (wxT("CYAN"));
- wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
-
- wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
- wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
- wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
+ wxRED_PEN = new wxPen (wxT("RED"), 1, wxSOLID);
+ wxCYAN_PEN = new wxPen (wxT("CYAN"), 1, wxSOLID);
+ wxGREEN_PEN = new wxPen (wxT("GREEN"), 1, wxSOLID);
+ wxBLACK_PEN = new wxPen (wxT("BLACK"), 1, wxSOLID);
+ wxWHITE_PEN = new wxPen (wxT("WHITE"), 1, wxSOLID);
+ wxTRANSPARENT_PEN = new wxPen (wxT("BLACK"), 1, wxTRANSPARENT);
+ wxBLACK_DASHED_PEN = new wxPen (wxT("BLACK"), 1, wxSHORT_DASH);
+ wxGREY_PEN = new wxPen (wxT("GREY"), 1, wxSOLID);
+ wxMEDIUM_GREY_PEN = new wxPen (wxT("MEDIUM GREY"), 1, wxSOLID);
+ wxLIGHT_GREY_PEN = new wxPen (wxT("LIGHT GREY"), 1, wxSOLID);
+
+ wxBLUE_BRUSH = new wxBrush (wxT("BLUE"), wxSOLID);
+ wxGREEN_BRUSH = new wxBrush (wxT("GREEN"), wxSOLID);
+ wxWHITE_BRUSH = new wxBrush (wxT("WHITE"), wxSOLID);
+ wxBLACK_BRUSH = new wxBrush (wxT("BLACK"), wxSOLID);
+ wxTRANSPARENT_BRUSH = new wxBrush (wxT("BLACK"), wxTRANSPARENT);
+ wxCYAN_BRUSH = new wxBrush (wxT("CYAN"), wxSOLID);
+ wxRED_BRUSH = new wxBrush (wxT("RED"), wxSOLID);
+ wxGREY_BRUSH = new wxBrush (wxT("GREY"), wxSOLID);
+ wxMEDIUM_GREY_BRUSH = new wxBrush (wxT("MEDIUM GREY"), wxSOLID);
+ wxLIGHT_GREY_BRUSH = new wxBrush (wxT("LIGHT GREY"), wxSOLID);
+
+ wxBLACK = new wxColour (wxT("BLACK"));
+ wxWHITE = new wxColour (wxT("WHITE"));
+ wxRED = new wxColour (wxT("RED"));
+ wxBLUE = new wxColour (wxT("BLUE"));
+ wxGREEN = new wxColour (wxT("GREEN"));
+ wxCYAN = new wxColour (wxT("CYAN"));
+ wxLIGHT_GREY = new wxColour (wxT("LIGHT GREY"));
+
+ wxSTANDARD_CURSOR = new wxCursor (wxCURSOR_ARROW);
+ wxHOURGLASS_CURSOR = new wxCursor (wxCURSOR_WAIT);
+ wxCROSS_CURSOR = new wxCursor (wxCURSOR_CROSS);
}
void wxDeleteStockObjects ()
{
- 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);
+ 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);
+ wxDELETE(wxTheBrushList);
+ wxDELETE(wxThePenList);
+ wxDELETE(wxTheFontList);
+ wxDELETE(wxTheBitmapList);
}
// ============================================================================
// wxTheXXXList stuff (semi-obsolete)
// ============================================================================
-wxBitmapList::wxBitmapList()
-{
-}
-
wxBitmapList::~wxBitmapList ()
{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
+ 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;
+ wxBitmap *bitmap = (wxBitmap *) node->GetData ();
+ wxList::compatibility_iterator next = node->GetNext ();
+ if (bitmap->GetVisible())
+ delete bitmap;
+ node = next;
}
}
// Pen and Brush lists
wxPenList::~wxPenList ()
{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
+ wxList::compatibility_iterator node = GetFirst ();
+ while (node)
{
- wxPen *pen = (wxPen *) node->GetData ();
- wxList::compatibility_iterator next = node->GetNext ();
- if (pen->GetVisible())
- delete pen;
- node = next;
+ wxPen *pen = (wxPen *) node->GetData ();
+ wxList::compatibility_iterator next = node->GetNext ();
+ if (pen->GetVisible())
+ delete pen;
+ node = next;
}
}
void wxPenList::AddPen (wxPen * pen)
{
- Append (pen);
+ Append (pen);
}
void wxPenList::RemovePen (wxPen * pen)
{
- DeleteObject (pen);
+ DeleteObject (pen);
}
wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
AddPen(pen);
// we'll delete it ourselves later
- pen->SetVisible(TRUE);
+ pen->SetVisible(true);
return pen;
}
wxBrushList::~wxBrushList ()
{
- wxList::compatibility_iterator node = GetFirst ();
- while (node)
+ 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;
+ 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);
+ Append (brush);
}
wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
AddBrush(brush);
// we'll delete it ourselves later
- brush->SetVisible(TRUE);
+ brush->SetVisible(true);
return brush;
}
void wxBrushList::RemoveBrush (wxBrush * brush)
{
- DeleteObject (brush);
+ DeleteObject (brush);
}
wxFontList::~wxFontList ()
void wxFontList::AddFont (wxFont * font)
{
- Append (font);
+ Append (font);
}
void wxFontList::RemoveFont (wxFont * font)
{
- DeleteObject (font);
+ DeleteObject (font);
}
wxFont *wxFontList::FindOrCreateFont(int pointSize,
// a different font if we create it with empty facename, but it is
// still better than never matching anything in the cache at all
// in this case
- if ( same && !!facename )
+ if ( same && !facename.empty() )
{
const wxString& fontFace = font->GetFaceName();
AddFont(font);
// and mark it as being cacheable
- font->SetVisible(TRUE);
+ font->SetVisible(true);
}
return font;
projects / wxWidgets.git / blobdiff