projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
RemoveItem should return the same object it is passed, but adjusted
[wxWidgets.git] / wxPython / wxPython / _windows.py
diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py
index 7cd51fd621cd05ad31da6ec336a92a427a878f70..b30036553b8d83ac3f55a515b98ee8221e34eba7 100644 (file)
--- a/wxPython/wxPython/_windows.py
+++ b/wxPython/wxPython/_windows.py
@@ -20,11 +20,9 @@ del sys, _wx
 
 # Now assign all the reverse-renamed names:
 wxPanel = wx._windows.Panel
-wxPanelPtr = wx._windows.PanelPtr
 wxPrePanel = wx._windows.PrePanel
 wxPanel_GetClassDefaultAttributes = wx._windows.Panel_GetClassDefaultAttributes
 wxScrolledWindow = wx._windows.ScrolledWindow
-wxScrolledWindowPtr = wx._windows.ScrolledWindowPtr
 wxPreScrolledWindow = wx._windows.PreScrolledWindow
 wxScrolledWindow_GetClassDefaultAttributes = wx._windows.ScrolledWindow_GetClassDefaultAttributes
 wxFrameNameStr = wx._windows.FrameNameStr
@@ -69,17 +67,13 @@ wxTOPLEVEL_EX_DIALOG = wx._windows.TOPLEVEL_EX_DIALOG
 wxUSER_ATTENTION_INFO = wx._windows.USER_ATTENTION_INFO
 wxUSER_ATTENTION_ERROR = wx._windows.USER_ATTENTION_ERROR
 wxTopLevelWindow = wx._windows.TopLevelWindow
-wxTopLevelWindowPtr = wx._windows.TopLevelWindowPtr
 wxFrame = wx._windows.Frame
-wxFramePtr = wx._windows.FramePtr
 wxPreFrame = wx._windows.PreFrame
 wxFrame_GetClassDefaultAttributes = wx._windows.Frame_GetClassDefaultAttributes
 wxDialog = wx._windows.Dialog
-wxDialogPtr = wx._windows.DialogPtr
 wxPreDialog = wx._windows.PreDialog
 wxDialog_GetClassDefaultAttributes = wx._windows.Dialog_GetClassDefaultAttributes
 wxMiniFrame = wx._windows.MiniFrame
-wxMiniFramePtr = wx._windows.MiniFramePtr
 wxPreMiniFrame = wx._windows.PreMiniFrame
 wxSPLASH_CENTRE_ON_PARENT = wx._windows.SPLASH_CENTRE_ON_PARENT
 wxSPLASH_CENTRE_ON_SCREEN = wx._windows.SPLASH_CENTRE_ON_SCREEN
@@ -87,14 +81,11 @@ wxSPLASH_NO_CENTRE = wx._windows.SPLASH_NO_CENTRE
 wxSPLASH_TIMEOUT = wx._windows.SPLASH_TIMEOUT
 wxSPLASH_NO_TIMEOUT = wx._windows.SPLASH_NO_TIMEOUT
 wxSplashScreenWindow = wx._windows.SplashScreenWindow
-wxSplashScreenWindowPtr = wx._windows.SplashScreenWindowPtr
 wxSplashScreen = wx._windows.SplashScreen
-wxSplashScreenPtr = wx._windows.SplashScreenPtr
 wxSB_NORMAL = wx._windows.SB_NORMAL
 wxSB_FLAT = wx._windows.SB_FLAT
 wxSB_RAISED = wx._windows.SB_RAISED
 wxStatusBar = wx._windows.StatusBar
-wxStatusBarPtr = wx._windows.StatusBarPtr
 wxPreStatusBar = wx._windows.PreStatusBar
 wxStatusBar_GetClassDefaultAttributes = wx._windows.StatusBar_GetClassDefaultAttributes
 wxSplitterNameStr = wx._windows.SplitterNameStr
@@ -113,11 +104,9 @@ wxSPLIT_DRAG_NONE = wx._windows.SPLIT_DRAG_NONE
 wxSPLIT_DRAG_DRAGGING = wx._windows.SPLIT_DRAG_DRAGGING
 wxSPLIT_DRAG_LEFT_DOWN = wx._windows.SPLIT_DRAG_LEFT_DOWN
 wxSplitterWindow = wx._windows.SplitterWindow
-wxSplitterWindowPtr = wx._windows.SplitterWindowPtr
 wxPreSplitterWindow = wx._windows.PreSplitterWindow
 wxSplitterWindow_GetClassDefaultAttributes = wx._windows.SplitterWindow_GetClassDefaultAttributes
 wxSplitterEvent = wx._windows.SplitterEvent
-wxSplitterEventPtr = wx._windows.SplitterEventPtr
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wx._windows.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wx._windows.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
 wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wx._windows.wxEVT_COMMAND_SPLITTER_DOUBLECLICKED
@@ -138,12 +127,10 @@ wxSASH_BOTTOM = wx._windows.SASH_BOTTOM
 wxSASH_LEFT = wx._windows.SASH_LEFT
 wxSASH_NONE = wx._windows.SASH_NONE
 wxSashWindow = wx._windows.SashWindow
-wxSashWindowPtr = wx._windows.SashWindowPtr
 wxPreSashWindow = wx._windows.PreSashWindow
 wxSASH_STATUS_OK = wx._windows.SASH_STATUS_OK
 wxSASH_STATUS_OUT_OF_RANGE = wx._windows.SASH_STATUS_OUT_OF_RANGE
 wxSashEvent = wx._windows.SashEvent
-wxSashEventPtr = wx._windows.SashEventPtr
 wxEVT_SASH_DRAGGED = wx._windows.wxEVT_SASH_DRAGGED
 wxLAYOUT_HORIZONTAL = wx._windows.LAYOUT_HORIZONTAL
 wxLAYOUT_VERTICAL = wx._windows.LAYOUT_VERTICAL
@@ -159,41 +146,29 @@ wxLAYOUT_QUERY = wx._windows.LAYOUT_QUERY
 wxEVT_QUERY_LAYOUT_INFO = wx._windows.wxEVT_QUERY_LAYOUT_INFO
 wxEVT_CALCULATE_LAYOUT = wx._windows.wxEVT_CALCULATE_LAYOUT
 wxQueryLayoutInfoEvent = wx._windows.QueryLayoutInfoEvent
-wxQueryLayoutInfoEventPtr = wx._windows.QueryLayoutInfoEventPtr
 wxCalculateLayoutEvent = wx._windows.CalculateLayoutEvent
-wxCalculateLayoutEventPtr = wx._windows.CalculateLayoutEventPtr
 wxSashLayoutWindow = wx._windows.SashLayoutWindow
-wxSashLayoutWindowPtr = wx._windows.SashLayoutWindowPtr
 wxPreSashLayoutWindow = wx._windows.PreSashLayoutWindow
 wxLayoutAlgorithm = wx._windows.LayoutAlgorithm
-wxLayoutAlgorithmPtr = wx._windows.LayoutAlgorithmPtr
 wxPopupWindow = wx._windows.PopupWindow
-wxPopupWindowPtr = wx._windows.PopupWindowPtr
 wxPrePopupWindow = wx._windows.PrePopupWindow
 wxPopupTransientWindow = wx._windows.PopupTransientWindow
-wxPopupTransientWindowPtr = wx._windows.PopupTransientWindowPtr
 wxPopupTransientWindow = wx._windows.PopupTransientWindow
 wxPrePopupTransientWindow = wx._windows.PrePopupTransientWindow
 wxTipWindow = wx._windows.TipWindow
-wxTipWindowPtr = wx._windows.TipWindowPtr
 wxVScrolledWindow = wx._windows.VScrolledWindow
-wxVScrolledWindowPtr = wx._windows.VScrolledWindowPtr
 wxVScrolledWindow = wx._windows.VScrolledWindow
 wxPreVScrolledWindow = wx._windows.PreVScrolledWindow
 wxVListBoxNameStr = wx._windows.VListBoxNameStr
 wxVListBox = wx._windows.VListBox
-wxVListBoxPtr = wx._windows.VListBoxPtr
 wxVListBox = wx._windows.VListBox
 wxPreVListBox = wx._windows.PreVListBox
 wxHtmlListBox = wx._windows.HtmlListBox
-wxHtmlListBoxPtr = wx._windows.HtmlListBoxPtr
 wxHtmlListBox = wx._windows.HtmlListBox
 wxPreHtmlListBox = wx._windows.PreHtmlListBox
 wxTaskBarIcon = wx._windows.TaskBarIcon
-wxTaskBarIconPtr = wx._windows.TaskBarIconPtr
 wxTaskBarIcon = wx._windows.TaskBarIcon
 wxTaskBarIconEvent = wx._windows.TaskBarIconEvent
-wxTaskBarIconEventPtr = wx._windows.TaskBarIconEventPtr
 wxEVT_TASKBAR_MOVE = wx._windows.wxEVT_TASKBAR_MOVE
 wxEVT_TASKBAR_LEFT_DOWN = wx._windows.wxEVT_TASKBAR_LEFT_DOWN
 wxEVT_TASKBAR_LEFT_UP = wx._windows.wxEVT_TASKBAR_LEFT_UP
@@ -208,32 +183,22 @@ wxFileSelectorDefaultWildcardStr = wx._windows.FileSelectorDefaultWildcardStr
 wxGetTextFromUserPromptStr = wx._windows.GetTextFromUserPromptStr
 wxMessageBoxCaptionStr = wx._windows.MessageBoxCaptionStr
 wxColourData = wx._windows.ColourData
-wxColourDataPtr = wx._windows.ColourDataPtr
 wxColourDialog = wx._windows.ColourDialog
-wxColourDialogPtr = wx._windows.ColourDialogPtr
+wxGetColourFromUser = wx._windows.GetColourFromUser
 wxDirDialog = wx._windows.DirDialog
-wxDirDialogPtr = wx._windows.DirDialogPtr
 wxFileDialog = wx._windows.FileDialog
-wxFileDialogPtr = wx._windows.FileDialogPtr
 wxCHOICEDLG_STYLE = wx._windows.CHOICEDLG_STYLE
 wxMultiChoiceDialog = wx._windows.MultiChoiceDialog
-wxMultiChoiceDialogPtr = wx._windows.MultiChoiceDialogPtr
 wxSingleChoiceDialog = wx._windows.SingleChoiceDialog
-wxSingleChoiceDialogPtr = wx._windows.SingleChoiceDialogPtr
 wxTextEntryDialogStyle = wx._windows.TextEntryDialogStyle
 wxTextEntryDialog = wx._windows.TextEntryDialog
-wxTextEntryDialogPtr = wx._windows.TextEntryDialogPtr
 wxGetPasswordFromUserPromptStr = wx._windows.GetPasswordFromUserPromptStr
 wxPasswordEntryDialog = wx._windows.PasswordEntryDialog
-wxPasswordEntryDialogPtr = wx._windows.PasswordEntryDialogPtr
 wxFontData = wx._windows.FontData
-wxFontDataPtr = wx._windows.FontDataPtr
 wxFontDialog = wx._windows.FontDialog
-wxFontDialogPtr = wx._windows.FontDialogPtr
+wxGetFontFromUser = wx._windows.GetFontFromUser
 wxMessageDialog = wx._windows.MessageDialog
-wxMessageDialogPtr = wx._windows.MessageDialogPtr
 wxProgressDialog = wx._windows.ProgressDialog
-wxProgressDialogPtr = wx._windows.ProgressDialogPtr
 wxFR_DOWN = wx._windows.FR_DOWN
 wxFR_WHOLEWORD = wx._windows.FR_WHOLEWORD
 wxFR_MATCHCASE = wx._windows.FR_MATCHCASE
@@ -247,11 +212,8 @@ wxEVT_COMMAND_FIND_REPLACE = wx._windows.wxEVT_COMMAND_FIND_REPLACE
 wxEVT_COMMAND_FIND_REPLACE_ALL = wx._windows.wxEVT_COMMAND_FIND_REPLACE_ALL
 wxEVT_COMMAND_FIND_CLOSE = wx._windows.wxEVT_COMMAND_FIND_CLOSE
 wxFindDialogEvent = wx._windows.FindDialogEvent
-wxFindDialogEventPtr = wx._windows.FindDialogEventPtr
 wxFindReplaceData = wx._windows.FindReplaceData
-wxFindReplaceDataPtr = wx._windows.FindReplaceDataPtr
 wxFindReplaceDialog = wx._windows.FindReplaceDialog
-wxFindReplaceDialogPtr = wx._windows.FindReplaceDialogPtr
 wxPreFindReplaceDialog = wx._windows.PreFindReplaceDialog
 IDM_WINDOWTILE = wx._windows.IDM_WINDOWTILE
 IDM_WINDOWTILEHOR = wx._windows.IDM_WINDOWTILEHOR
@@ -263,22 +225,16 @@ IDM_WINDOWPREV = wx._windows.IDM_WINDOWPREV
 wxFIRST_MDI_CHILD = wx._windows.FIRST_MDI_CHILD
 wxLAST_MDI_CHILD = wx._windows.LAST_MDI_CHILD
 wxMDIParentFrame = wx._windows.MDIParentFrame
-wxMDIParentFramePtr = wx._windows.MDIParentFramePtr
 wxPreMDIParentFrame = wx._windows.PreMDIParentFrame
 wxMDIChildFrame = wx._windows.MDIChildFrame
-wxMDIChildFramePtr = wx._windows.MDIChildFramePtr
 wxPreMDIChildFrame = wx._windows.PreMDIChildFrame
 wxMDIClientWindow = wx._windows.MDIClientWindow
-wxMDIClientWindowPtr = wx._windows.MDIClientWindowPtr
 wxPreMDIClientWindow = wx._windows.PreMDIClientWindow
 wxPyWindow = wx._windows.PyWindow
-wxPyWindowPtr = wx._windows.PyWindowPtr
 wxPrePyWindow = wx._windows.PrePyWindow
 wxPyPanel = wx._windows.PyPanel
-wxPyPanelPtr = wx._windows.PyPanelPtr
 wxPrePyPanel = wx._windows.PrePyPanel
 wxPyScrolledWindow = wx._windows.PyScrolledWindow
-wxPyScrolledWindowPtr = wx._windows.PyScrolledWindowPtr
 wxPrePyScrolledWindow = wx._windows.PrePyScrolledWindow
 wxPrintoutTitleStr = wx._windows.PrintoutTitleStr
 wxPreviewCanvasNameStr = wx._windows.PreviewCanvasNameStr
@@ -303,28 +259,19 @@ wxPRINTBIN_CASSETTE = wx._windows.PRINTBIN_CASSETTE
 wxPRINTBIN_FORMSOURCE = wx._windows.PRINTBIN_FORMSOURCE
 wxPRINTBIN_USER = wx._windows.PRINTBIN_USER
 wxPrintData = wx._windows.PrintData
-wxPrintDataPtr = wx._windows.PrintDataPtr
 wxPageSetupDialogData = wx._windows.PageSetupDialogData
-wxPageSetupDialogDataPtr = wx._windows.PageSetupDialogDataPtr
 wxPageSetupDialog = wx._windows.PageSetupDialog
-wxPageSetupDialogPtr = wx._windows.PageSetupDialogPtr
 wxPrintDialogData = wx._windows.PrintDialogData
-wxPrintDialogDataPtr = wx._windows.PrintDialogDataPtr
 wxPrintDialog = wx._windows.PrintDialog
-wxPrintDialogPtr = wx._windows.PrintDialogPtr
 wxPRINTER_NO_ERROR = wx._windows.PRINTER_NO_ERROR
 wxPRINTER_CANCELLED = wx._windows.PRINTER_CANCELLED
 wxPRINTER_ERROR = wx._windows.PRINTER_ERROR
 wxPrinter = wx._windows.Printer
-wxPrinterPtr = wx._windows.PrinterPtr
 wxPrinter_GetLastError = wx._windows.Printer_GetLastError
 wxPrintout = wx._windows.Printout
-wxPrintoutPtr = wx._windows.PrintoutPtr
 wxPrintout = wx._windows.Printout
 wxPreviewCanvas = wx._windows.PreviewCanvas
-wxPreviewCanvasPtr = wx._windows.PreviewCanvasPtr
 wxPreviewFrame = wx._windows.PreviewFrame
-wxPreviewFramePtr = wx._windows.PreviewFramePtr
 wxPREVIEW_PRINT = wx._windows.PREVIEW_PRINT
 wxPREVIEW_PREVIOUS = wx._windows.PREVIEW_PREVIOUS
 wxPREVIEW_NEXT = wx._windows.PREVIEW_NEXT
@@ -342,15 +289,13 @@ wxID_PREVIEW_FIRST = wx._windows.ID_PREVIEW_FIRST
 wxID_PREVIEW_LAST = wx._windows.ID_PREVIEW_LAST
 wxID_PREVIEW_GOTO = wx._windows.ID_PREVIEW_GOTO
 wxPreviewControlBar = wx._windows.PreviewControlBar
-wxPreviewControlBarPtr = wx._windows.PreviewControlBarPtr
 wxPrintPreview = wx._windows.PrintPreview
-wxPrintPreviewPtr = wx._windows.PrintPreviewPtr
 wxPyPrintPreview = wx._windows.PyPrintPreview
-wxPyPrintPreviewPtr = wx._windows.PyPrintPreviewPtr
 wxPyPreviewFrame = wx._windows.PyPreviewFrame
-wxPyPreviewFramePtr = wx._windows.PyPreviewFramePtr
 wxPyPreviewControlBar = wx._windows.PyPreviewControlBar
-wxPyPreviewControlBarPtr = wx._windows.PyPreviewControlBarPtr
+
+wxFRAME_EX_CONTEXTHELP = wx._windows.FRAME_EX_CONTEXTHELP
+wxDIALOG_EX_CONTEXTHELP = wx._windows.DIALOG_EX_CONTEXTHELP
 
 
 d = globals()
wxWidgets (Impactor)