workaround font data bug

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

diff --git a/utils/wxPython/demo/wxFontDialog.py b/utils/wxPython/demo/wxFontDialog.py
index ec1caa73ffc27a1e42afd8b0b46a468c00e31089..f4c623feaea49c087c9b5f3121d1e30beef9bddd 100644 (file)
--- a/utils/wxPython/demo/wxFontDialog.py
+++ b/utils/wxPython/demo/wxFontDialog.py
@@ -4,7 +4,8 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    dlg = wxFontDialog(frame)
+    data = wxFontData()
+    dlg = wxFontDialog(frame, data)

     if dlg.ShowModal() == wxID_OK:
         data = dlg.GetFontData()
         font = data.GetChosenFont()
     if dlg.ShowModal() == wxID_OK:
         data = dlg.GetFontData()
         font = data.GetChosenFont()


@@ -33,7 +34,7 @@ This class represents the font chooser dialog.
 wxFontDialog()
 ----------------------------
 
 wxFontDialog()
 ----------------------------
 

-wxFontDialog(wxWindow* parent, wxFontData* data = NULL)
+wxFontDialog(wxWindow* parent, wxFontData* data)

 
 

-Constructor. Pass a parent window, and optionally a pointer to a block of font data, which will be copied to the font dialog's font data.
+Constructor. Pass a parent window and a font data object, which will be copied to the font dialog's font data.

 """
 """

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index dee7e09c4e237fdc8622ef5cd6741aa847456078..158e2350178e19064f44a2ddc94b30c5fd03d166 100644 (file)
--- a/utils/wxPython/src/cmndlgs.i
+++ b/utils/wxPython/src/cmndlgs.i
@@ -188,7 +188,7 @@ public:
 
 class wxFontDialog : public wxDialog {
 public:
 
 class wxFontDialog : public wxDialog {
 public:

-    wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
+    wxFontDialog(wxWindow* parent, wxFontData* data);

 
     %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"