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

Added wx.GetColourFromUser and wx.GetFontFromUser

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-02 19:35:00 +00:00
parent 9d7dfdff8c
commit 1979aa5872
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/src/__windows_rename.i
View File

@@ -110,6 +110,7 @@
%rename(TaskBarIconEvent) wxTaskBarIconEvent; %rename(TaskBarIconEvent) wxTaskBarIconEvent;
%rename(ColourData) wxColourData; %rename(ColourData) wxColourData;
%rename(ColourDialog) wxColourDialog; %rename(ColourDialog) wxColourDialog;
%rename(GetColourFromUser) wxGetColourFromUser;
%rename(DirDialog) wxDirDialog; %rename(DirDialog) wxDirDialog;
%rename(FileDialog) wxFileDialog; %rename(FileDialog) wxFileDialog;
%rename(CHOICEDLG_STYLE) wxCHOICEDLG_STYLE; %rename(CHOICEDLG_STYLE) wxCHOICEDLG_STYLE;
@@ -120,6 +121,7 @@
%rename(PasswordEntryDialog) wxPasswordEntryDialog; %rename(PasswordEntryDialog) wxPasswordEntryDialog;
%rename(FontData) wxFontData; %rename(FontData) wxFontData;
%rename(FontDialog) wxFontDialog; %rename(FontDialog) wxFontDialog;
%rename(GetFontFromUser) wxGetFontFromUser;
%rename(MessageDialog) wxMessageDialog; %rename(MessageDialog) wxMessageDialog;
%rename(ProgressDialog) wxProgressDialog; %rename(ProgressDialog) wxProgressDialog;
%rename(FR_DOWN) wxFR_DOWN; %rename(FR_DOWN) wxFR_DOWN;

10
wxPython/src/_cmndlgs.i
View File

@@ -98,6 +98,11 @@ instance.", "");
}; };
wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
const wxColour& colInit = wxNullColour,
const wxString& caption = wxPyEmptyString);
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
@@ -590,6 +595,11 @@ wx.FontDialog.", "");
}; };
wxFont wxGetFontFromUser(wxWindow *parent = NULL,
const wxFont& fontInit = wxNullFont,
const wxString& caption = wxPyEmptyString);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
wxPython/wxPython/_windows.py
View File

@@ -211,6 +211,7 @@ wxColourData = wx._windows.ColourData
wxColourDataPtr = wx._windows.ColourDataPtr wxColourDataPtr = wx._windows.ColourDataPtr
wxColourDialog = wx._windows.ColourDialog wxColourDialog = wx._windows.ColourDialog
wxColourDialogPtr = wx._windows.ColourDialogPtr wxColourDialogPtr = wx._windows.ColourDialogPtr
wxGetColourFromUser = wx._windows.GetColourFromUser
wxDirDialog = wx._windows.DirDialog wxDirDialog = wx._windows.DirDialog
wxDirDialogPtr = wx._windows.DirDialogPtr wxDirDialogPtr = wx._windows.DirDialogPtr
wxFileDialog = wx._windows.FileDialog wxFileDialog = wx._windows.FileDialog
@@ -230,6 +231,7 @@ wxFontData = wx._windows.FontData
wxFontDataPtr = wx._windows.FontDataPtr wxFontDataPtr = wx._windows.FontDataPtr
wxFontDialog = wx._windows.FontDialog wxFontDialog = wx._windows.FontDialog
wxFontDialogPtr = wx._windows.FontDialogPtr wxFontDialogPtr = wx._windows.FontDialogPtr
wxGetFontFromUser = wx._windows.GetFontFromUser
wxMessageDialog = wx._windows.MessageDialog wxMessageDialog = wx._windows.MessageDialog
wxMessageDialogPtr = wx._windows.MessageDialogPtr wxMessageDialogPtr = wx._windows.MessageDialogPtr
wxProgressDialog = wx._windows.ProgressDialog wxProgressDialog = wx._windows.ProgressDialog