Added wx.GetColourFromUser and wx.GetFontFromUser

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__windows_rename.i b/wxPython/src/__windows_rename.i
index 517ad4c354b7bf418fa0436459a17efd81229090..54be883dc636f7f80fc3e31b1b4785831a89bfdc 100644 (file)
--- a/wxPython/src/__windows_rename.i
+++ b/wxPython/src/__windows_rename.i
@@ -110,6 +110,7 @@
 %rename(TaskBarIconEvent)                   wxTaskBarIconEvent;
 %rename(ColourData)                         wxColourData;
 %rename(ColourDialog)                       wxColourDialog;
 %rename(TaskBarIconEvent)                   wxTaskBarIconEvent;
 %rename(ColourData)                         wxColourData;
 %rename(ColourDialog)                       wxColourDialog;

+%rename(GetColourFromUser)                  wxGetColourFromUser;

 %rename(DirDialog)                          wxDirDialog;
 %rename(FileDialog)                         wxFileDialog;
 %rename(CHOICEDLG_STYLE)                    wxCHOICEDLG_STYLE;
 %rename(DirDialog)                          wxDirDialog;
 %rename(FileDialog)                         wxFileDialog;
 %rename(CHOICEDLG_STYLE)                    wxCHOICEDLG_STYLE;


@@ -120,6 +121,7 @@
 %rename(PasswordEntryDialog)                wxPasswordEntryDialog;
 %rename(FontData)                           wxFontData;
 %rename(FontDialog)                         wxFontDialog;
 %rename(PasswordEntryDialog)                wxPasswordEntryDialog;
 %rename(FontData)                           wxFontData;
 %rename(FontDialog)                         wxFontDialog;

+%rename(GetFontFromUser)                    wxGetFontFromUser;

 %rename(MessageDialog)                      wxMessageDialog;
 %rename(ProgressDialog)                     wxProgressDialog;
 %rename(FR_DOWN)                            wxFR_DOWN;
 %rename(MessageDialog)                      wxMessageDialog;
 %rename(ProgressDialog)                     wxProgressDialog;
 %rename(FR_DOWN)                            wxFR_DOWN;

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index f7ea72c2cb5ccf0827d0ed29e9a4d218bd292e8e..901f41f1a25441bc562b3aea7ad23b0411161a74 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -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);
+
+

 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py
index 7cd51fd621cd05ad31da6ec336a92a427a878f70..03a1d5942c4f91b96d5d65fa7f0ae4a1215cb504 100644 (file)
--- a/wxPython/wxPython/_windows.py
+++ b/wxPython/wxPython/_windows.py
@@ -211,6 +211,7 @@ wxColourData = wx._windows.ColourData
 wxColourDataPtr = wx._windows.ColourDataPtr
 wxColourDialog = wx._windows.ColourDialog
 wxColourDialogPtr = wx._windows.ColourDialogPtr
 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
 wxDirDialog = wx._windows.DirDialog
 wxDirDialogPtr = wx._windows.DirDialogPtr
 wxFileDialog = wx._windows.FileDialog


@@ -230,6 +231,7 @@ wxFontData = wx._windows.FontData
 wxFontDataPtr = wx._windows.FontDataPtr
 wxFontDialog = wx._windows.FontDialog
 wxFontDialogPtr = wx._windows.FontDialogPtr
 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
 wxMessageDialog = wx._windows.MessageDialog
 wxMessageDialogPtr = wx._windows.MessageDialogPtr
 wxProgressDialog = wx._windows.ProgressDialog