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

Minimal changes needed to build/run wxPython on the 2.5 branch after

Browse Source 
the merge.  Still need to look for and apply most changes and new
additions that have happened since the last merge.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-18 02:26:53 +00:00
parent fd657b8a59
commit dd116e73f0
22 changed files with 1923 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wxPython/src/gdi.i
View File

@@ -432,31 +432,20 @@ public:
class wxColourDatabase : public wxObject {
public:
wxColour *FindColour(const wxString& colour);
wxColour *FindColour(const wxString& colour) ;
wxColour *FindColourNoAdd(const wxString& colour) const;
wxString FindName(const wxColour& colour) const;
%addmethods {
void AddColour(const wxString& name, wxColour* colour) {
// make a copy since the python one will be GC'd
wxColour* c = new wxColour(*colour);
self->AddColour(name, c);
}
void Append(const wxString& name, int red, int green, int blue) {
// first see if the name is already there
wxString cName = name;
cName.MakeUpper();
wxString cName2 = cName;
if ( !cName2.Replace(wxT("GRAY"), wxT("GREY")) )
cName2.clear();
wxNode *node = self->GetFirst();
while ( node ) {
const wxChar *key = node->GetKeyString();
if ( cName == key || cName2 == key ) {
wxColour* c = (wxColour *)node->GetData();
c->Set(red, green, blue);
return;
}
node = node->GetNext();
}
// otherwise append the new colour
self->Append(name.c_str(), new wxColour(red, green, blue));
wxColour* c = new wxColour(red, green, blue);
self->AddColour(name, c);
}
}
};
@@ -1164,6 +1153,8 @@ public:
#if 0
%}
// See also wxPy_ReinitStockObjects in helpers.cpp
extern wxFont *wxNORMAL_FONT;
extern wxFont *wxSMALL_FONT;
extern wxFont *wxITALIC_FONT;