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

Final touch for wxColour <-> wxString and wxColourBase by Francesco Montorsi.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-28 17:59:28 +00:00
parent 33cf9a1922
commit 7d01c54d7f
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/colour.h
View File

@@ -16,7 +16,7 @@
#include "wx/gdiobj.h" #include "wx/gdiobj.h"
// the standard wxColour constructor. // the standard wxColour constructors;
// this macro avoids to repeat these lines across all colour.h files, since // this macro avoids to repeat these lines across all colour.h files, since
// Set() is a virtual function and thus cannot be called by wxColourBase // Set() is a virtual function and thus cannot be called by wxColourBase
// constructors // constructors
@@ -28,7 +28,7 @@
wxColour(const wxChar *colourName) { Set(colourName); } wxColour(const wxChar *colourName) { Set(colourName); }
// for wxString <-> wxColour // flags for wxColour -> wxString conversion (see wxColour::GetAsString)
#define wxC2S_NAME 1 // return colour name, when possible #define wxC2S_NAME 1 // return colour name, when possible
#define wxC2S_CSS_SYNTAX 2 // return colour in rgb(r,g,b) syntax #define wxC2S_CSS_SYNTAX 2 // return colour in rgb(r,g,b) syntax
#define wxC2S_HTML_SYNTAX 4 // return colour in #rrggbb syntax #define wxC2S_HTML_SYNTAX 4 // return colour in #rrggbb syntax
@@ -95,9 +95,10 @@ public:
// old, deprecated // old, deprecated
// --------------- // ---------------
static wxColour CreateByName(const wxString& name); #if WXWIN_COMPATIBILITY_2_6
void InitFromName(const wxString& col) wxDEPRECATED( static wxColour CreateByName(const wxString& name) );
{ Set(col); } wxDEPRECATED( void InitFromName(const wxString& col) );
#endif
}; };

10
src/common/colourcmn.cpp
View File

@@ -101,7 +101,17 @@ wxString wxColourBase::GetAsString(long flags) const
return colName; return colName;
} }
#if WXWIN_COMPATIBILITY_2_6
// static
wxColour wxColourBase::CreateByName(const wxString& name) wxColour wxColourBase::CreateByName(const wxString& name)
{ {
return wxColour(name); return wxColour(name);
} }
void wxColourBase::InitFromName(const wxString& col)
{
Set(col);
}
#endif // WXWIN_COMPATIBILITY_2_6