Amebis/wxWidgets
1
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

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);
}