Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ 1473731 ] 'wxColourBase and wxString <-> wxColour implementation' with minor modifications and rebaked build files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-24 14:52:23 +00:00
parent cab0703813
commit 40989e46b8
41 changed files with 745 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cocoa/colour.mm
View File

@@ -10,11 +10,13 @@
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/colour.h"
#ifndef WX_PRECOMP
#endif //WX_PRECOMP
#include "wx/gdicmn.h"
#include "wx/colour.h"
#include "wx/cocoa/autorelease.h"
@@ -55,28 +57,12 @@ wxColour& wxColour::operator =(const wxColour& col)
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour ()
{
[m_cocoaNSColor release];
}
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b)
{
wxAutoNSAutoreleasePool pool;
[m_cocoaNSColor release];

99
src/common/colourcmn.cpp Normal file
View File

@@ -0,0 +1,99 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/common/colourcmn.cpp
// Purpose: wxColourBase implementation
// Author: Francesco Montorsi
// Modified by:
// Created: 20/4/2006
// RCS-ID: $Id$
// Copyright: (c) Francesco Montorsi
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/colour.h"
// ============================================================================
// wxString <-> wxColour conversions
// ============================================================================
bool wxColourBase::FromString(const wxChar *str)
{
if ( str == NULL || str[0] == wxT('\0'))
return false; // invalid or empty string
if ( wxStrncmp(str, wxT("RGB"), 3) == 0 ||
wxStrncmp(str, wxT("rgb"), 3) == 0 )
{
// RGB specification CSS-like
int red, green, blue;
if (wxSscanf(&str[3], wxT("(%d, %d, %d)"), &red, &green, &blue) != 3)
return false;
Set((unsigned char)red, (unsigned char)green, (unsigned char)blue);
}
else if ( str[0] == wxT('#') && wxStrlen(str) == 7 )
{
// hexadecimal prefixed with # (HTML syntax)
unsigned long tmp;
if (wxSscanf(&str[1], wxT("%lX"), &tmp) != 1)
return false;
Set(tmp); // set from packed long
}
else if (wxTheColourDatabase) // a colour name ?
{
// we can't do
// *this = wxTheColourDatabase->Find(str)
// because this place can be called from constructor
// and 'this' could not be available yet
wxColour clr = wxTheColourDatabase->Find(str);
Set((unsigned char)clr.Red(), (unsigned char)clr.Green(), (unsigned char)clr.Blue());
}
if (Ok())
return true;
wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str);
return false;
}
wxString wxColourBase::GetAsString(long flags) const
{
wxString colName;
if (flags & wxC2S_NAME)
colName = wxTheColourDatabase->FindName((const wxColour &)(*this)).MakeLower();
if ( colName.empty() && (flags & wxC2S_CSS_SYNTAX) )
{
// no name for this colour; return it in CSS syntax
colName.Printf(wxT("rgb(%d, %d, %d)"),
Red(), Green(), Blue());
}
else if ( colName.empty() && (flags & wxC2S_HTML_SYNTAX) )
{
// no name for this colour; return it in HTML syntax
colName.Printf(wxT("#%02X%02X%02X"),
Red(), Green(), Blue());
}
// this function always returns a non-empty string
wxASSERT_MSG(!colName.empty(),
wxT("Invalid wxColour -> wxString conversion flags"));
return colName;
}
wxColour wxColourBase::CreateByName(const wxString& name)
{
return wxColour(name);
}

48
src/common/gdicmn.cpp
View File

@@ -400,8 +400,6 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
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();
@@ -415,48 +413,12 @@ wxColour wxColourDatabase::Find(const wxString& colour) const
if ( it != m_map->end() )
return *(it->second);
// 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() )
{
// cache it
self->AddColour(colour, col);
}
return col;
#elif defined(__X__)
// TODO: move this to wxColour::CreateByName()
XColor xcolour;
#ifdef __WXMOTIF__
Display *display = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()) ;
#endif
#ifdef __WXX11__
Display* display = (Display*) wxGetDisplay();
#endif
/* MATTHEW: [4] Use wxGetMainColormap */
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(r, g, b);
AddColour(colour, col);
return col;
#else // other platform
// we did not find any result in existing colours:
// we won't use wxString -> wxColour conversion because the
// wxColour::Set(const wxString &) function which does that conversion
// internally uses this function (wxColourDatabase::Find) and we want
// to avoid infinite recursion !
return wxNullColour;
#endif // platforms
}
wxString wxColourDatabase::FindName(const wxColour& colour) const

63
src/gtk/colour.cpp
View File

@@ -11,6 +11,7 @@
#include "wx/wxprec.h"
#include "wx/colour.h"
#include "wx/gtk/private.h"
#include <gdk/gdk.h>
@@ -81,51 +82,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
m_refData = new wxColourRefData;
M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
M_COLDATA->m_color.pixel = 0;
}
/* static */
wxColour wxColour::CreateByName(const wxString& name)
{
wxColour col;
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV_SYS( name ), &colGDK ) )
{
wxColourRefData *refData = new wxColourRefData;
refData->m_color = colGDK;
col.m_refData = refData;
}
return col;
}
void wxColour::InitFromName( const wxString &colourName )
{
// check the cache first
if ( wxTheColourDatabase )
{
*this = wxTheColourDatabase->Find(colourName);
}
if ( !Ok() )
{
*this = CreateByName(colourName);
}
if ( !Ok() )
{
wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
}
}
wxColour::~wxColour()
{
}
@@ -155,7 +111,7 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
return new wxColourRefData(*(wxColourRefData *)data);
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
@@ -209,3 +165,18 @@ GdkColor *wxColour::GetColor() const
return &M_COLDATA->m_color;
}
bool wxColour::FromString(const wxChar *str)
{
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
{
UnRef();
m_refData = new wxColourRefData;
M_COLDATA->m_color = colGDK;
return true;
}
return wxColourBase::FromString(str);
}

68
src/gtk1/colour.cpp
View File

@@ -11,6 +11,7 @@
#include "wx/wxprec.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/gtk1/private.h"
@@ -136,56 +137,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
m_refData = new wxColourRefData();
M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
M_COLDATA->m_color.pixel = 0;
}
/* static */
wxColour wxColour::CreateByName(const wxString& name)
{
wxColour col;
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )
{
wxColourRefData *refData = new wxColourRefData;
refData->m_color = colGDK;
col.m_refData = refData;
}
return col;
}
void wxColour::InitFromName( const wxString &colourName )
{
// check the cache first
wxColour col;
if ( wxTheColourDatabase )
{
col = wxTheColourDatabase->Find(colourName);
}
if ( !col.Ok() )
{
col = CreateByName(colourName);
}
if ( col.Ok() )
{
*this = col;
}
else
{
wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
}
}
wxColour::~wxColour()
{
}
@@ -215,7 +166,7 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
return new wxColourRefData(*(wxColourRefData *)data);
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
@@ -269,3 +220,18 @@ GdkColor *wxColour::GetColor() const
return &M_COLDATA->m_color;
}
bool wxColour::FromString(const wxChar *str)
{
GdkColor colGDK;
if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
{
UnRef();
m_refData = new wxColourRefData;
M_COLDATA->m_color = colGDK;
return true;
}
return wxColourBase::FromString(str);
}

18
src/html/htmltag.cpp
View File

@@ -15,10 +15,11 @@
#if wxUSE_HTML
#include "wx/html/htmltag.h"
#ifndef WXPRECOMP
#endif
#include "wx/html/htmltag.h"
#include "wx/html/htmlpars.h"
#include "wx/colour.h"
#include <stdio.h> // for vsscanf
@@ -410,20 +411,13 @@ int wxHtmlTag::ScanParam(const wxString& par,
bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
{
wxASSERT(clr);
wxString str = GetParam(par);
if (str.empty()) return false;
if (str.GetChar(0) == wxT('#'))
{
unsigned long tmp;
if (ScanParam(par, wxT("#%lX"), &tmp) != 1)
return false;
*clr = wxColour((unsigned char)((tmp & 0xFF0000) >> 16),
(unsigned char)((tmp & 0x00FF00) >> 8),
(unsigned char)(tmp & 0x0000FF));
if (clr->Set(str))
return true;
}
else
if (!str.empty())
{
// Handle colours defined in HTML 4.0:
#define HTML_COLOUR(name,r,g,b) \

21
src/mac/carbon/colour.cpp
View File

@@ -11,9 +11,10 @@
#include "wx/wxprec.h"
#include "wx/gdicmn.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/mac/private.h"
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
@@ -37,27 +38,11 @@ void wxColour::Init()
wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find( name );
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour ()
{
}
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

23
src/mac/classic/colour.cpp
View File

@@ -9,9 +9,12 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/gdicmn.h"
#include "wx/wxprec.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
// Colour
@@ -70,27 +73,11 @@ wxColour& wxColour::operator =(const wxColour& col)
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour ()
{
}
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

23
src/mgl/colour.cpp
View File

@@ -12,12 +12,13 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/gdicmn.h"
#include "wx/colour.h"
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
@@ -50,27 +51,11 @@ wxColour& wxColour::operator =(const wxColour& col)
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour()
{
}
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

46
src/motif/colour.cpp
View File

@@ -15,8 +15,9 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/gdicmn.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/app.h"
#ifdef __VMS__
@@ -42,11 +43,6 @@ void wxColour::Init()
m_pixel = -1;
}
wxColour::wxColour()
{
Init();
}
wxColour::wxColour(const wxColour& col)
{
*this = col;
@@ -62,47 +58,11 @@ wxColour& wxColour::operator =(const wxColour& col)
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
/* static */
wxColour wxColour::CreateByName(const wxString& name)
{
wxColour col;
Display *dpy = wxGlobalDisplay();
WXColormap colormap = wxTheApp->GetMainColormap( dpy );
XColor xcol;
if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
{
col.m_red = (unsigned char)(xcol.red & 0xff);
col.m_green = (unsigned char)(xcol.green & 0xff);
col.m_blue = (unsigned char)(xcol.blue & 0xff);
col.m_isInit = true;
col.m_pixel = -1;
}
return col;
}
wxColour::~wxColour()
{
}
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

38
src/msw/colour.cpp
View File

@@ -12,13 +12,14 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/gdicmn.h"
#include "wx/msw/private.h"
#include "wx/colour.h"
#include <string.h>
@@ -26,28 +27,17 @@
template<> void wxStringReadValue(const wxString &s , wxColour &data )
{
// copied from VS xrc
unsigned long tmp = 0;
if (s.Length() != 7 || s[0u] != wxT('#')
|| wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
if ( !data.Set(s) )
{
wxLogError(_("String To Colour : Incorrect colour specification : %s"),
s.c_str() );
data = wxNullColour;
}
else
{
data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
(unsigned char) ((tmp & 0x00FF00) >> 8),
(unsigned char) ((tmp & 0x0000FF)));
}
}
template<> void wxStringWriteValue(wxString &s , const wxColour &data )
{
s = wxString::Format(wxT("#%02X%02X%02X"),
data.Red(), data.Green(), data.Blue() );
s = data.GetAsString(wxC2S_HTML_SYNTAX);
}
wxTO_STRING_IMP( wxColour )
@@ -80,27 +70,11 @@ void wxColour::Init()
m_green = 0;
}
void wxColour::InitFromName(const wxString& name)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(name);
if ( col.Ok() )
{
*this = col;
return;
}
}
// leave invalid
Init();
}
wxColour::~wxColour()
{
}
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

12
src/os2/colour.cpp
View File

@@ -12,8 +12,9 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#ifndef WX_PRECOMP
#include "wx/colour.h"
#endif
#include "wx/gdicmn.h"
@@ -69,15 +70,8 @@ void wxColour::InitFromName(
const wxString& sCol
)
{
if ( wxTheColourDatabase )
{
wxColour col = wxTheColourDatabase->Find(sCol);
if ( col.Ok() )
{
*this = col;
if ( wxString2Colour(sCol, this) )
return;
}
}
// leave invalid
Init();

26
src/palmos/colour.cpp
View File

@@ -11,10 +11,11 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#include "wx/gdicmn.h"
@@ -25,28 +26,17 @@
template<> void wxStringReadValue(const wxString &s , wxColour &data )
{
// copied from VS xrc
unsigned long tmp = 0;
if (s.Length() != 7 || s[0u] != wxT('#')
|| wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
if ( !data.Set(s) )
{
wxLogError(_("String To Colour : Incorrect colour specification : %s"),
s.c_str() );
data = wxNullColour;
}
else
{
data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
(unsigned char) ((tmp & 0x00FF00) >> 8),
(unsigned char) ((tmp & 0x0000FF)));
}
}
template<> void wxStringWriteValue(wxString &s , const wxColour &data )
{
s = wxString::Format(wxT("#%02X%02X%02X"),
data.Red(), data.Green(), data.Blue() );
s = data.GetAsString(wxC2S_HTML_SYNTAX);
}
wxTO_STRING_IMP( wxColour )
@@ -94,17 +84,11 @@ wxColour& wxColour::operator=(const wxColour& col)
return *this;
}
void wxColour::InitFromName(const wxString& name)
{
// leave invalid
Init();
}
wxColour::~wxColour()
{
}
void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b)
{
m_red = r;
m_green = g;

185
src/richtext/richtexthtml.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: richtext/richtexthtml.cpp
// Name: src/richtext/richtexthtml.cpp
// Purpose: HTML I/O for wxRichTextCtrl
// Author: Julian Smart
// Modified by:
@@ -13,7 +13,7 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_RICHTEXT
@@ -21,7 +21,7 @@
#include "wx/richtext/richtexthtml.h"
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/wx.h"
#endif
#include "wx/filename.h"
@@ -53,55 +53,54 @@ bool wxRichTextHTMLHandler::DoLoadFile(wxRichTextBuffer *WXUNUSED(buffer), wxInp
bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
{
buffer->Defragment();
wxTextOutputStream str(stream);
wxTextAttrEx currentParaStyle = buffer->GetAttributes();
wxTextAttrEx currentCharStyle = buffer->GetAttributes();
str << wxT("<html><head></head><body>\n");
/*
wxRichText may be support paper formats like a1/a2/a3/a4
when this widget grown enough, i should turn back and support its new features
but not yet
str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td>");
wxString left_indent = SymbolicIndent(currentParaStyle.GetLeftIndent());
wxString right_indent = SymbolicIndent(currentParaStyle.GetRightIndent());
str << wxString::Format(wxT("%s</td><td></td><td>%s</td></tr><tr>"),
left_indent.c_str(), //Document-Wide Left Indent
right_indent.c_str()); //Document-Wide Right Indent
str << wxT("<td></td><td width=\"100%\">");
*/
str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
str << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\" color=\"#%02X%02X%02X\" >"),
currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ),
currentParaStyle.GetTextColour().Red(), currentParaStyle.GetTextColour().Green(),
currentParaStyle.GetTextColour().Blue());
str << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\" color=\"%s\" >"),
currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ),
currentParaStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
//wxString align = GetAlignment( currentParaStyle.GetAlignment() );
//str << wxString::Format(wxT("<p align=\"%s\">"), align );
m_font = false;
m_indent = 0;
m_list = false;
wxRichTextObjectList::compatibility_iterator node = buffer->GetChildren().GetFirst();
while (node)
{
wxRichTextParagraph* para = wxDynamicCast(node->GetData(), wxRichTextParagraph);
wxASSERT (para != NULL);
if (para)
{
OutputParagraphFormatting(currentParaStyle, para->GetAttributes(), stream);
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
while (node2)
{
@@ -110,16 +109,16 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
if (textObj && !textObj->IsEmpty())
{
BeginCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
str << textObj->GetText();
EndCharacterFormatting(currentCharStyle, obj->GetAttributes(), stream);
}
wxRichTextImage* image = wxDynamicCast(obj, wxRichTextImage);
if( image && !image->IsEmpty())
Image_to_Base64( image, stream );
node2 = node2->GetNext();
}
str << wxT("\n");
@@ -127,16 +126,16 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
}
node = node->GetNext();
}
str << wxT("</font></td></tr></table></body></html>\n");
return true;
}
void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& currentStyle, const wxTextAttrEx& thisStyle, wxOutputStream& stream)
{
wxTextOutputStream str(stream);
//Is the item bulleted one?
if( thisStyle.GetBulletStyle() != wxTEXT_ATTR_BULLET_STYLE_NONE )
{
@@ -144,7 +143,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
if( m_list )
{
//Yes there is
//Is the item among the previous ones
//Is the item one of the previous list tag's child items
if( (thisStyle.GetLeftIndent() == (m_indent + 100)) || (thisStyle.GetLeftIndent() < 100) )
@@ -152,14 +151,14 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
else
{
//No it isn't
//So we should close the list tag
str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
//And renavigate to new list's horizontal position
NavigateToListPosition(thisStyle, str);
//Ok it's done
//Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
wxString tag;
TypeOfList(thisStyle, tag);
@@ -169,29 +168,29 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
else
{
//No there isn't a list
//navigate to new list's horizontal position(indent)
NavigateToListPosition(thisStyle, str);
NavigateToListPosition(thisStyle, str);
//Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
wxString tag;
TypeOfList(thisStyle, tag);
str << tag << wxT("<li>");
//Now we have a list, mark it.
m_list = true;
}
}
}
else if( m_list )
{
//The item is not bulleted and there is a list what should be closed now.
//The item is not bulleted and there is a list what should be closed now.
//So close the list
str << (m_is_ul ? wxT("</ul>") : wxT("</ol>"));
//And mark as there is no an opened list
m_list = false;
}
// does the item have an indentation ?
if( thisStyle.GetLeftIndent() )
{
@@ -224,7 +223,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
Indent(thisStyle, str);
m_indent = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
m_indents.Add( m_indent );
break;
}
else if( m_indent == (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) )
@@ -238,9 +237,9 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
else
{
str << wxT("</td></tr></table>");
m_indents.RemoveAt(i);
if( i < 1 ){m_indent=0; break;}
m_indent = m_indents[i-1];
}
@@ -259,33 +258,32 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
else if( m_indent )
{
//The item is not indented and there is a table(s) what should be closed now.
//So close them
for(unsigned int i = 0; i < m_indents.size(); i++ )
str << wxT("</td></tr></table>");
m_indent = 0;
m_indents.Clear();
}
wxString style;
//Is there any change on the font properties of the item
if( thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName() )
style += wxString::Format(wxT(" face=\"%s\""), thisStyle.GetFont().GetFaceName().c_str());
if( thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize() )
style += wxString::Format(wxT(" size=\"%ld\""), Pt_To_Size(thisStyle.GetFont().GetPointSize()) );
if( thisStyle.GetTextColour() != currentStyle.GetTextColour() )
style += wxString::Format(wxT(" color=\"#%02X%02X%02X\""), thisStyle.GetTextColour().Red(),
thisStyle.GetTextColour().Green(), thisStyle.GetTextColour().Blue());
style += wxString::Format(wxT(" color=\"%s\""), thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
if( style.size() )
{
str << wxString::Format(wxT("<font %s >"), style.c_str());
m_font = true;
}
if( thisStyle.GetFont().GetWeight() == wxBOLD )
str << wxT("<b>");
if( thisStyle.GetFont().GetStyle() == wxITALIC )
@@ -297,14 +295,14 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttrEx& WXUNUSED(currentStyle), const wxTextAttrEx& thisStyle, wxOutputStream& stream)
{
wxTextOutputStream str(stream);
if( thisStyle.GetFont().GetUnderlined() )
str << wxT("</u>");
if( thisStyle.GetFont().GetStyle() == wxITALIC )
str << wxT("</i>");
if( thisStyle.GetFont().GetWeight() == wxBOLD )
str << wxT("</b>");
if( m_font )
{
m_font = false;
@@ -328,8 +326,8 @@ void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle
{
//indenting an item using an ul/ol tag is equal to inserting 5 x &nbsp; on its left side.
//so we should start from 100 point left
//Is the second td's left wall of the current indentaion table at the 100+ point-left-side
//Is the second td's left wall of the current indentaion table at the 100+ point-left-side
//of the item, horizontally?
if( m_indent + 100 < thisStyle.GetLeftIndent() )
{
@@ -340,11 +338,11 @@ void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle
return;
}
//No it isn't
int i = m_indents.size() - 1;
for(; i > -1; i--)
{
//Is the second td's left wall of the current indentaion table at the 100+ point-left-side
//Is the second td's left wall of the current indentaion table at the 100+ point-left-side
//of the item ?
if( m_indent + 100 < thisStyle.GetLeftIndent() )
{
@@ -361,9 +359,9 @@ void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle
//No it is not, the second td's left wall of the current indentaion table is at the
//right side of the current item horizontally, so close it.
str << wxT("</td></tr></table>");
m_indents.RemoveAt(i);
if( i < 1 ){m_indent=0; break;}
m_indent = m_indents[i-1];
}
@@ -373,14 +371,14 @@ void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputS
{
//As a five year experienced web developer i assure you there is no way to indent an item
//in html way, but we can use tables.
//Item -> "Hello world"
//Its Left Indentation -> 100
//Its Left Sub-Indentation ->40
//A typical indentation-table for the item will be construct as the following
//3 x nbsp = 60
//2 x nbsp = 40
//LSI = Left Sub Indent
@@ -388,17 +386,17 @@ void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputS
//
//-------------------------------------------
//|&nbsp;&nbsp;nbsp;|nbsp;nbsp;Hello World |
//| | | | |
//| | | | |
//| V | V |
//| --LI-- | --LSI-- |
//-------------------------------------------
str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
str << wxT("<td width=\"100%\">");
if( thisStyle.GetLeftSubIndent() < 0 )
{
str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
@@ -418,21 +416,21 @@ void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutput
//r.EndNumberedBullet();
//
//A typical indentation-table for the item will be construct as the following
//1 x nbsp = 20 point
//ULI -> 100pt (UL/OL tag indents its sub element by 100 point)
//<--------- 100 pt ---------->|
//------------------------------------------------------
//|&nbsp;&nbsp;nbsp;&nbsp;nbsp;|<ul> |
//| |<-ULI-><li>first item |
//| |<-ULI-><li>first item |
//| |<-ULI-><li>second item |
//| |</ul> |
//------------------------------------------------------
// |<-100->|
// |<-100->|
str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
str << wxT("<td width=\"100%\">");
@@ -440,9 +438,9 @@ void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutput
void wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString& tag )
{
//We can use number attribute of li tag but not all the browsers support it.
//We can use number attribute of li tag but not all the browsers support it.
//also wxHtmlWindow doesn't support type attribute.
m_is_ul = false;
if( thisStyle.GetBulletStyle() == (wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD))
tag = wxT("<ol type=\"1\">");
@@ -481,20 +479,20 @@ wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttrEx& thisStyle )
void wxRichTextHTMLHandler::Image_to_Base64(wxRichTextImage* image, wxOutputStream& stream)
{
wxTextOutputStream str(stream);
str << wxT("<img src=\"");
str << wxT("data:");
str << GetMimeType(image->GetImageBlock().GetImageType());
str << wxT(";base64,");
if (image->GetImage().Ok() && !image->GetImageBlock().GetData())
image->MakeBlock();
wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() );
str << data;
delete[] data;
str << wxT("\" />");
}
@@ -543,19 +541,19 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
//elements of enc64 array must be 8 bit values
//otherwise encoder will fail
//hmmm.. Does wxT macro define a char as 16 bit value
//when compiling with UNICODE option?
//when compiling with UNICODE option?
static const wxChar enc64[] = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
wxChar* output = new wxChar[4*((in_len+2)/3)+1];
wxChar* p = output;
while( in_len-- > 0 )
{
register wxChar a, b;
a = *input++;
*p++ = enc64[ (a >> 2) & 0x3f ];
if( in_len-- <= 0 )
{
*p++ = enc64[ (a << 4 ) & 0x30 ];
@@ -563,26 +561,26 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
*p++ = '=';
break;
}
b = *input++;
*p++ = enc64[(( a << 4 ) | ((b >> 4) &0xf )) & 0x3f];
if( in_len-- <= 0 )
{
*p++ = enc64[ (b << 2) & 0x3f ];
*p++ = '=';
break;
}
a = *input++;
*p++ = enc64[ ((( b << 2 ) & 0x3f ) | ((a >> 6)& 0x3)) & 0x3f ];
*p++ = enc64[ a & 0x3f ];
}
*p = 0;
return output;
}
#endif
@@ -590,4 +588,3 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
#endif
// wxUSE_RICHTEXT

4
src/wxWindows.dsp
View File

@@ -353,6 +353,10 @@ SOURCE=.\common\cmndata.cpp
# End Source File
# Begin Source File
SOURCE=.\common\colourcmn.cpp
# End Source File
# Begin Source File
SOURCE=.\common\config.cpp
# End Source File
# Begin Source File

83
src/x11/colour.cpp
View File

@@ -9,6 +9,11 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/app.h"
@@ -136,64 +141,6 @@ void wxColourRefData::AllocColour( WXColormap cmap )
IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
m_refData = new wxColourRefData();
#if wxUSE_NANOX
M_COLDATA->m_color.red = ((unsigned short)red) ;
M_COLDATA->m_color.green = ((unsigned short)green) ;
M_COLDATA->m_color.blue = ((unsigned short)blue) ;
#else
M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
#endif
M_COLDATA->m_color.pixel = 0;
}
/* static */
wxColour wxColour::CreateByName(const wxString& name)
{
wxColour col;
Display *dpy = wxGlobalDisplay();
WXColormap colormap = wxTheApp->GetMainColormap( dpy );
XColor xcol;
if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
{
wxColourRefData *refData = new wxColourRefData;
refData->m_colormap = colormap;
refData->m_color = xcol;
col.m_refData = refData;
}
return col;
}
void wxColour::InitFromName( const wxString &colourName )
{
// check the cache first
wxColour col;
if ( wxTheColourDatabase )
{
col = wxTheColourDatabase->Find(colourName);
}
if ( !col.Ok() )
{
col = CreateByName(colourName);
}
if ( col.Ok() )
{
*this = col;
}
else
{
wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
}
}
wxColour::~wxColour()
{
}
@@ -223,7 +170,7 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
return new wxColourRefData(*(wxColourRefData *)data);
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
{
AllocExclusive();
@@ -294,3 +241,21 @@ WXColor *wxColour::GetColor() const
return (WXColor*) &M_COLDATA->m_color;
}
bool wxColour::FromString(const wxChar *name)
{
Display *dpy = wxGlobalDisplay();
WXColormap colormap = wxTheApp->GetMainColormap( dpy );
XColor xcol;
if ( XParseColor( dpy, (Colormap)colormap, wxGTK_CONV_SYS( name ), &xcol ) )
{
UnRef();
m_refData = new wxColourRefData;
M_COLDATA->m_colormap = colormap;
M_COLDATA->m_color = xcol;
return true;
}
return wxColourBase::FromString(name);
}

6
src/xml/xml.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xml.cpp
// Name: src/xml/xml.cpp
// Purpose: wxXmlDocument - XML parser & data holder class
// Author: Vaclav Slavik
// Created: 2000/03/05
@@ -15,10 +15,10 @@
#pragma hdrstop
#endif
#include "wx/xml/xml.h"
#if wxUSE_XML
#include "wx/xml/xml.h"
#include "wx/wfstream.h"
#include "wx/datstrm.h"
#include "wx/zstream.h"