From eb67b7039dc8d6e13d4edc708de667abf66cee25 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 17 Aug 2002 19:07:19 +0000 Subject: [PATCH] Fixed wxPython's wxArt constants git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/misc2.i | 85 +++++++++++++++++++------------------- wxPython/src/msw/misc2.cpp | 37 ----------------- wxPython/src/msw/misc2.py | 79 ++++++++++++++++++----------------- wxPython/src/windows2.i | 2 +- 4 files changed, 85 insertions(+), 118 deletions(-) diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index 5e080982f0..a5bce532e4 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -1459,49 +1459,48 @@ extern wxMimeTypesManager* wxTheMimeTypesManager; %} -// Art clients -#define wxART_TOOLBAR "toolbar_C" -#define wxART_MENU "menu_C" -#define wxART_FRAME_ICON "frame_icon_C" - -#define wxART_CMN_DIALOG "cmn_dialog_C" -#define wxART_HELP_BROWSER "help_browser_C" -#define wxART_MESSAGE_BOX "message_box_C" - -#define wxART_OTHER "other_C" - -// Art IDs -#define wxART_ADD_BOOKMARK "add_bookmark" -#define wxART_DEL_BOOKMARK "del_bookmark" -#define wxART_HELP_SIDE_PANEL "help_side_panel" -#define wxART_HELP_SETTINGS "help_settings" -#define wxART_HELP_BOOK "help_book" -#define wxART_HELP_FOLDER "help_folder" -#define wxART_HELP_PAGE "help_page" -#define wxART_GO_BACK "go_back" -#define wxART_GO_FORWARD "go_forward" -#define wxART_GO_UP "go_up" -#define wxART_GO_DOWN "go_down" -#define wxART_GO_TO_PARENT "go_to_parent" -#define wxART_GO_HOME "go_home" -#define wxART_FILE_OPEN "file_open" -#define wxART_PRINT "print" -#define wxART_HELP "help" -#define wxART_TIP "tip" -#define wxART_REPORT_VIEW "report_view" -#define wxART_LIST_VIEW "list_view" -#define wxART_NEW_DIR "new_dir" -#define wxART_FOLDER "folder" -#define wxART_GO_DIR_UP "go_dir_up" -#define wxART_EXECUTABLE_FILE "executable_file" -#define wxART_NORMAL_FILE "normal_file" -#define wxART_TICK_MARK "tick" -#define wxART_CROSS_MARK "cross" -#define wxART_ERROR "error" -#define wxART_QUESTION "question" -#define wxART_WARNING "warning" -#define wxART_INFORMATION "information" - +%pragma(python) code = " +# Art clients +wxART_TOOLBAR = 'wxART_TOOLBAR_C' +wxART_MENU = 'wxART_MENU_C' +wxART_FRAME_ICON = 'wxART_FRAME_ICON_C' +wxART_CMN_DIALOG = 'wxART_CMN_DIALOG_C' +wxART_HELP_BROWSER = 'wxART_HELP_BROWSER_C' +wxART_MESSAGE_BOX = 'wxART_MESSAGE_BOX_C' +wxART_OTHER = 'wxART_OTHER_C' + +# Art IDs +wxART_ADD_BOOKMARK = 'wxART_ADD_BOOKMARK' +wxART_DEL_BOOKMARK = 'wxART_DEL_BOOKMARK' +wxART_HELP_SIDE_PANEL = 'wxART_HELP_SIDE_PANEL' +wxART_HELP_SETTINGS = 'wxART_HELP_SETTINGS' +wxART_HELP_BOOK = 'wxART_HELP_BOOK' +wxART_HELP_FOLDER = 'wxART_HELP_FOLDER' +wxART_HELP_PAGE = 'wxART_HELP_PAGE' +wxART_GO_BACK = 'wxART_GO_BACK' +wxART_GO_FORWARD = 'wxART_GO_FORWARD' +wxART_GO_UP = 'wxART_GO_UP' +wxART_GO_DOWN = 'wxART_GO_DOWN' +wxART_GO_TO_PARENT = 'wxART_GO_TO_PARENT' +wxART_GO_HOME = 'wxART_GO_HOME' +wxART_FILE_OPEN = 'wxART_FILE_OPEN' +wxART_PRINT = 'wxART_PRINT' +wxART_HELP = 'wxART_HELP' +wxART_TIP = 'wxART_TIP' +wxART_REPORT_VIEW = 'wxART_REPORT_VIEW' +wxART_LIST_VIEW = 'wxART_LIST_VIEW' +wxART_NEW_DIR = 'wxART_NEW_DIR' +wxART_FOLDER = 'wxART_FOLDER' +wxART_GO_DIR_UP = 'wxART_GO_DIR_UP' +wxART_EXECUTABLE_FILE = 'wxART_EXECUTABLE_FILE' +wxART_NORMAL_FILE = 'wxART_NORMAL_FILE' +wxART_TICK_MARK = 'wxART_TICK_MARK' +wxART_CROSS_MARK = 'wxART_CROSS_MARK' +wxART_ERROR = 'wxART_ERROR' +wxART_QUESTION = 'wxART_QUESTION' +wxART_WARNING = 'wxART_WARNING' +wxART_INFORMATION = 'wxART_INFORMATION' +" %{ // Python aware wxArtProvider class wxPyArtProvider : public wxArtProvider { diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp index 2e05528dfe..1c55aa1c0a 100644 --- a/wxPython/src/msw/misc2.cpp +++ b/wxPython/src/msw/misc2.cpp @@ -10966,43 +10966,6 @@ SWIGEXPORT(void) initmisc2c() { PyDict_SetItemString(d,"wxMAILCAP_ALL", PyInt_FromLong((long) wxMAILCAP_ALL)); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxTheMimeTypesManager",_wrap_wxTheMimeTypesManager_get, _wrap_wxTheMimeTypesManager_set); - PyDict_SetItemString(d,"wxART_TOOLBAR", PyString_FromString("toolbar_C")); - PyDict_SetItemString(d,"wxART_MENU", PyString_FromString("menu_C")); - PyDict_SetItemString(d,"wxART_FRAME_ICON", PyString_FromString("frame_icon_C")); - PyDict_SetItemString(d,"wxART_CMN_DIALOG", PyString_FromString("cmn_dialog_C")); - PyDict_SetItemString(d,"wxART_HELP_BROWSER", PyString_FromString("help_browser_C")); - PyDict_SetItemString(d,"wxART_MESSAGE_BOX", PyString_FromString("message_box_C")); - PyDict_SetItemString(d,"wxART_OTHER", PyString_FromString("other_C")); - PyDict_SetItemString(d,"wxART_ADD_BOOKMARK", PyString_FromString("add_bookmark")); - PyDict_SetItemString(d,"wxART_DEL_BOOKMARK", PyString_FromString("del_bookmark")); - PyDict_SetItemString(d,"wxART_HELP_SIDE_PANEL", PyString_FromString("help_side_panel")); - PyDict_SetItemString(d,"wxART_HELP_SETTINGS", PyString_FromString("help_settings")); - PyDict_SetItemString(d,"wxART_HELP_BOOK", PyString_FromString("help_book")); - PyDict_SetItemString(d,"wxART_HELP_FOLDER", PyString_FromString("help_folder")); - PyDict_SetItemString(d,"wxART_HELP_PAGE", PyString_FromString("help_page")); - PyDict_SetItemString(d,"wxART_GO_BACK", PyString_FromString("go_back")); - PyDict_SetItemString(d,"wxART_GO_FORWARD", PyString_FromString("go_forward")); - PyDict_SetItemString(d,"wxART_GO_UP", PyString_FromString("go_up")); - PyDict_SetItemString(d,"wxART_GO_DOWN", PyString_FromString("go_down")); - PyDict_SetItemString(d,"wxART_GO_TO_PARENT", PyString_FromString("go_to_parent")); - PyDict_SetItemString(d,"wxART_GO_HOME", PyString_FromString("go_home")); - PyDict_SetItemString(d,"wxART_FILE_OPEN", PyString_FromString("file_open")); - PyDict_SetItemString(d,"wxART_PRINT", PyString_FromString("print")); - PyDict_SetItemString(d,"wxART_HELP", PyString_FromString("help")); - PyDict_SetItemString(d,"wxART_TIP", PyString_FromString("tip")); - PyDict_SetItemString(d,"wxART_REPORT_VIEW", PyString_FromString("report_view")); - PyDict_SetItemString(d,"wxART_LIST_VIEW", PyString_FromString("list_view")); - PyDict_SetItemString(d,"wxART_NEW_DIR", PyString_FromString("new_dir")); - PyDict_SetItemString(d,"wxART_FOLDER", PyString_FromString("folder")); - PyDict_SetItemString(d,"wxART_GO_DIR_UP", PyString_FromString("go_dir_up")); - PyDict_SetItemString(d,"wxART_EXECUTABLE_FILE", PyString_FromString("executable_file")); - PyDict_SetItemString(d,"wxART_NORMAL_FILE", PyString_FromString("normal_file")); - PyDict_SetItemString(d,"wxART_TICK_MARK", PyString_FromString("tick")); - PyDict_SetItemString(d,"wxART_CROSS_MARK", PyString_FromString("cross")); - PyDict_SetItemString(d,"wxART_ERROR", PyString_FromString("error")); - PyDict_SetItemString(d,"wxART_QUESTION", PyString_FromString("question")); - PyDict_SetItemString(d,"wxART_WARNING", PyString_FromString("warning")); - PyDict_SetItemString(d,"wxART_INFORMATION", PyString_FromString("information")); wxPyPtrTypeMap_Add("wxDragImage", "wxGenericDragImage"); wxPyPtrTypeMap_Add("wxProcess", "wxPyProcess"); diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py index 6d83b5cd64..df54b3c25f 100644 --- a/wxPython/src/msw/misc2.py +++ b/wxPython/src/msw/misc2.py @@ -16,6 +16,48 @@ from events import * from streams import * from utils import * + +# Art clients +wxART_TOOLBAR = 'wxART_TOOLBAR_C' +wxART_MENU = 'wxART_MENU_C' +wxART_FRAME_ICON = 'wxART_FRAME_ICON_C' +wxART_CMN_DIALOG = 'wxART_CMN_DIALOG_C' +wxART_HELP_BROWSER = 'wxART_HELP_BROWSER_C' +wxART_MESSAGE_BOX = 'wxART_MESSAGE_BOX_C' +wxART_OTHER = 'wxART_OTHER_C' + +# Art IDs +wxART_ADD_BOOKMARK = 'wxART_ADD_BOOKMARK' +wxART_DEL_BOOKMARK = 'wxART_DEL_BOOKMARK' +wxART_HELP_SIDE_PANEL = 'wxART_HELP_SIDE_PANEL' +wxART_HELP_SETTINGS = 'wxART_HELP_SETTINGS' +wxART_HELP_BOOK = 'wxART_HELP_BOOK' +wxART_HELP_FOLDER = 'wxART_HELP_FOLDER' +wxART_HELP_PAGE = 'wxART_HELP_PAGE' +wxART_GO_BACK = 'wxART_GO_BACK' +wxART_GO_FORWARD = 'wxART_GO_FORWARD' +wxART_GO_UP = 'wxART_GO_UP' +wxART_GO_DOWN = 'wxART_GO_DOWN' +wxART_GO_TO_PARENT = 'wxART_GO_TO_PARENT' +wxART_GO_HOME = 'wxART_GO_HOME' +wxART_FILE_OPEN = 'wxART_FILE_OPEN' +wxART_PRINT = 'wxART_PRINT' +wxART_HELP = 'wxART_HELP' +wxART_TIP = 'wxART_TIP' +wxART_REPORT_VIEW = 'wxART_REPORT_VIEW' +wxART_LIST_VIEW = 'wxART_LIST_VIEW' +wxART_NEW_DIR = 'wxART_NEW_DIR' +wxART_FOLDER = 'wxART_FOLDER' +wxART_GO_DIR_UP = 'wxART_GO_DIR_UP' +wxART_EXECUTABLE_FILE = 'wxART_EXECUTABLE_FILE' +wxART_NORMAL_FILE = 'wxART_NORMAL_FILE' +wxART_TICK_MARK = 'wxART_TICK_MARK' +wxART_CROSS_MARK = 'wxART_CROSS_MARK' +wxART_ERROR = 'wxART_ERROR' +wxART_QUESTION = 'wxART_QUESTION' +wxART_WARNING = 'wxART_WARNING' +wxART_INFORMATION = 'wxART_INFORMATION' + class wxSystemSettingsPtr : def __init__(self,this): self.this = this @@ -1388,40 +1430,3 @@ wxMAILCAP_GNOME = misc2c.wxMAILCAP_GNOME wxMAILCAP_ALL = misc2c.wxMAILCAP_ALL cvar = misc2c.cvar wxTheMimeTypesManager = wxMimeTypesManagerPtr(misc2c.cvar.wxTheMimeTypesManager) -wxART_TOOLBAR = misc2c.wxART_TOOLBAR -wxART_MENU = misc2c.wxART_MENU -wxART_FRAME_ICON = misc2c.wxART_FRAME_ICON -wxART_CMN_DIALOG = misc2c.wxART_CMN_DIALOG -wxART_HELP_BROWSER = misc2c.wxART_HELP_BROWSER -wxART_MESSAGE_BOX = misc2c.wxART_MESSAGE_BOX -wxART_OTHER = misc2c.wxART_OTHER -wxART_ADD_BOOKMARK = misc2c.wxART_ADD_BOOKMARK -wxART_DEL_BOOKMARK = misc2c.wxART_DEL_BOOKMARK -wxART_HELP_SIDE_PANEL = misc2c.wxART_HELP_SIDE_PANEL -wxART_HELP_SETTINGS = misc2c.wxART_HELP_SETTINGS -wxART_HELP_BOOK = misc2c.wxART_HELP_BOOK -wxART_HELP_FOLDER = misc2c.wxART_HELP_FOLDER -wxART_HELP_PAGE = misc2c.wxART_HELP_PAGE -wxART_GO_BACK = misc2c.wxART_GO_BACK -wxART_GO_FORWARD = misc2c.wxART_GO_FORWARD -wxART_GO_UP = misc2c.wxART_GO_UP -wxART_GO_DOWN = misc2c.wxART_GO_DOWN -wxART_GO_TO_PARENT = misc2c.wxART_GO_TO_PARENT -wxART_GO_HOME = misc2c.wxART_GO_HOME -wxART_FILE_OPEN = misc2c.wxART_FILE_OPEN -wxART_PRINT = misc2c.wxART_PRINT -wxART_HELP = misc2c.wxART_HELP -wxART_TIP = misc2c.wxART_TIP -wxART_REPORT_VIEW = misc2c.wxART_REPORT_VIEW -wxART_LIST_VIEW = misc2c.wxART_LIST_VIEW -wxART_NEW_DIR = misc2c.wxART_NEW_DIR -wxART_FOLDER = misc2c.wxART_FOLDER -wxART_GO_DIR_UP = misc2c.wxART_GO_DIR_UP -wxART_EXECUTABLE_FILE = misc2c.wxART_EXECUTABLE_FILE -wxART_NORMAL_FILE = misc2c.wxART_NORMAL_FILE -wxART_TICK_MARK = misc2c.wxART_TICK_MARK -wxART_CROSS_MARK = misc2c.wxART_CROSS_MARK -wxART_ERROR = misc2c.wxART_ERROR -wxART_QUESTION = misc2c.wxART_QUESTION -wxART_WARNING = misc2c.wxART_WARNING -wxART_INFORMATION = misc2c.wxART_INFORMATION diff --git a/wxPython/src/windows2.i b/wxPython/src/windows2.i index 2e6872bccf..045654592e 100644 --- a/wxPython/src/windows2.i +++ b/wxPython/src/windows2.i @@ -669,7 +669,7 @@ public: void base_AddChild(wxWindow* child); void base_RemoveChild(wxWindow* child); -} +}; //--------------------------------------------------------------------------- -- 2.47.2