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

Little tweaks to match recent wxWidgets updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-01 00:06:58 +00:00
parent 4e819f106b
commit 020303e6f9
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/demo/ArtProvider.py
View File

@@ -33,7 +33,12 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
"wx.ART_REPORT_VIEW", "wx.ART_REPORT_VIEW",
"wx.ART_LIST_VIEW", "wx.ART_LIST_VIEW",
"wx.ART_NEW_DIR", "wx.ART_NEW_DIR",
"wx.ART_HARDDISK",
"wx.ART_FLOPPY",
"wx.ART_CDROM",
"wx.ART_REMOVABLE",
"wx.ART_FOLDER", "wx.ART_FOLDER",
"wx.ART_FOLDER_OPEN",
"wx.ART_GO_DIR_UP", "wx.ART_GO_DIR_UP",
"wx.ART_EXECUTABLE_FILE", "wx.ART_EXECUTABLE_FILE",
"wx.ART_NORMAL_FILE", "wx.ART_NORMAL_FILE",

5
wxPython/src/_artprov.i
View File

@@ -54,7 +54,12 @@ MAKE_CONST_WXSTRING(ART_TIP);
MAKE_CONST_WXSTRING(ART_REPORT_VIEW); MAKE_CONST_WXSTRING(ART_REPORT_VIEW);
MAKE_CONST_WXSTRING(ART_LIST_VIEW); MAKE_CONST_WXSTRING(ART_LIST_VIEW);
MAKE_CONST_WXSTRING(ART_NEW_DIR); MAKE_CONST_WXSTRING(ART_NEW_DIR);
MAKE_CONST_WXSTRING(ART_HARDDISK);
MAKE_CONST_WXSTRING(ART_FLOPPY);
MAKE_CONST_WXSTRING(ART_CDROM);
MAKE_CONST_WXSTRING(ART_REMOVABLE);
MAKE_CONST_WXSTRING(ART_FOLDER); MAKE_CONST_WXSTRING(ART_FOLDER);
MAKE_CONST_WXSTRING(ART_FOLDER_OPEN);
MAKE_CONST_WXSTRING(ART_GO_DIR_UP); MAKE_CONST_WXSTRING(ART_GO_DIR_UP);
MAKE_CONST_WXSTRING(ART_EXECUTABLE_FILE); MAKE_CONST_WXSTRING(ART_EXECUTABLE_FILE);
MAKE_CONST_WXSTRING(ART_NORMAL_FILE); MAKE_CONST_WXSTRING(ART_NORMAL_FILE);

5
wxPython/src/_brush.i
View File

@@ -90,6 +90,11 @@ have a wx.STIPPLE style, then the return value may be non-None but an
uninitialised bitmap (`wx.Bitmap.Ok` returns False).", ""); uninitialised bitmap (`wx.Bitmap.Ok` returns False).", "");
DocDeclStr(
bool , IsHatch() const,
"Is the current style a hatch type?", "");
DocDeclStr( DocDeclStr(
bool , Ok(), bool , Ok(),
"Returns True if the brush is initialised and valid.", ""); "Returns True if the brush is initialised and valid.", "");

2
wxPython/src/html.i
View File

@@ -972,7 +972,7 @@ public:
const wxString& normal_face = wxPyEmptyString, const wxString& normal_face = wxPyEmptyString,
const wxString& fixed_face = wxPyEmptyString); const wxString& fixed_face = wxPyEmptyString);
int Render(int x, int y, int from = 0, int dont_render = false, int to = INT_MAX, int Render(int x, int y, int from = 0, int dont_render = false, int maxHeight = INT_MAX,
//int *known_pagebreaks = NULL, int number_of_pages = 0 //int *known_pagebreaks = NULL, int number_of_pages = 0
int* choices=NULL, int LCOUNT = 0 int* choices=NULL, int LCOUNT = 0
); );

5
wxPython/wxPython/_misc.py
View File

@@ -412,7 +412,12 @@ wxART_TIP = wx._misc.ART_TIP
wxART_REPORT_VIEW = wx._misc.ART_REPORT_VIEW wxART_REPORT_VIEW = wx._misc.ART_REPORT_VIEW
wxART_LIST_VIEW = wx._misc.ART_LIST_VIEW wxART_LIST_VIEW = wx._misc.ART_LIST_VIEW
wxART_NEW_DIR = wx._misc.ART_NEW_DIR wxART_NEW_DIR = wx._misc.ART_NEW_DIR
wxART_HARDDISK = wx._misc.ART_HARDDISK
wxART_FLOPPY = wx._misc.ART_FLOPPY
wxART_CDROM = wx._misc.ART_CDROM
wxART_REMOVABLE = wx._misc.ART_REMOVABLE
wxART_FOLDER = wx._misc.ART_FOLDER wxART_FOLDER = wx._misc.ART_FOLDER
wxART_FOLDER_OPEN = wx._misc.ART_FOLDER_OPEN
wxART_GO_DIR_UP = wx._misc.ART_GO_DIR_UP wxART_GO_DIR_UP = wx._misc.ART_GO_DIR_UP
wxART_EXECUTABLE_FILE = wx._misc.ART_EXECUTABLE_FILE wxART_EXECUTABLE_FILE = wx._misc.ART_EXECUTABLE_FILE
wxART_NORMAL_FILE = wx._misc.ART_NORMAL_FILE wxART_NORMAL_FILE = wx._misc.ART_NORMAL_FILE