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

Merge recent changes from 2.8 branch.

Browse Source 
Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
wxPython/src/_cmndlgs.i
View File

@@ -113,9 +113,10 @@ wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
//--------------------------------------------------------------------------------
enum {
wxDD_CHANGE_DIR,
wxDD_DIR_MUST_EXIST,
wxDD_NEW_DIR_BUTTON,
wxDD_DEFAULT_STYLE,
wxDD_CHANGE_DIR,
};
DocStr(wxDirDialog,
@@ -129,10 +130,12 @@ Window Styles
wx.DEFAULT_DIALOG_STYLE, wx.DD_NEW_DIR_BUTTON
and wx.RESIZE_BORDER.
wx.DD_NEW_DIR_BUTTON Add 'Create new directory' button and allow
directory names to be editable. On Windows
the new directory button is only available
with recent versions of the common dialogs.
wx.DD_DIR_MUST_EXIST The dialog will allow the user to choose only an
existing folder. When this style is not given, a
'Create new directory' button is added to the dialog
(on Windows) or some other way is provided to the
user to type the name of a new folder.
Use this instead of deprecated wx.DD_NEW_DIR_BUTTON.
wx.DD_CHANGE_DIR Change the current working directory to the
directory chosen by the user.
@@ -195,15 +198,6 @@ public:
%}
enum {
// These will dissappear in 2.8
wxOPEN,
wxSAVE,
wxOVERWRITE_PROMPT,
wxFILE_MUST_EXIST,
wxMULTIPLE,
wxCHANGE_DIR,
wxHIDE_READONLY,
wxFD_OPEN,
wxFD_SAVE,
wxFD_OVERWRITE_PROMPT,
@@ -214,6 +208,17 @@ enum {
wxFD_DEFAULT_STYLE,
};
%pythoncode {
%# deprecated names
OPEN = FD_OPEN,
SAVE = FD_SAVE,
OVERWRITE_PROMPT = FD_OVERWRITE_PROMPT,
FILE_MUST_EXIST = FD_FILE_MUST_EXIST,
MULTIPLE = FD_MULTIPLE,
CHANGE_DIR = FD_CHANGE_DIR
}
DocStr(wxFileDialog,
"wx.FileDialog allows the user to select one or more files from the
filesystem.", "