Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

[wxWidgets.git] / include / wx / generic / choicdgg.h

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 2ccd871e432e5e2a778859c6bc79f4b4dded85ff..d583b4f48932289d9380b0b5d70bd2349f3b2cff 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxListBox;
 class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
 {
 public:
 class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
 {
 public:

-    wxAnyChoiceDialog() { }
+    wxAnyChoiceDialog();

 
     wxAnyChoiceDialog(wxWindow *parent,
                       const wxString& message,
 
     wxAnyChoiceDialog(wxWindow *parent,
                       const wxString& message,


@@ -46,11 +46,7 @@ public:
                       int n, const wxString *choices,
                       long styleDlg = wxCHOICEDLG_STYLE,
                       const wxPoint& pos = wxDefaultPosition,
                       int n, const wxString *choices,
                       long styleDlg = wxCHOICEDLG_STYLE,
                       const wxPoint& pos = wxDefaultPosition,

-                      long styleLbox = wxLB_ALWAYS_SB)
-    {
-        (void)Create(parent, message, caption, n, choices,
-                     styleDlg, pos, styleLbox);
-    }
+                      long styleLbox = wxLB_ALWAYS_SB);

 
     bool Create(wxWindow *parent,
                 const wxString& message,
 
     bool Create(wxWindow *parent,
                 const wxString& message,


@@ -73,10 +69,7 @@ protected:
 class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
 {
 public:
 class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
 {
 public:

-    wxSingleChoiceDialog()
-    {
-        m_selection = -1;
-    }
+    wxSingleChoiceDialog();

 
     wxSingleChoiceDialog(wxWindow *parent,
                          const wxString& message,
 
     wxSingleChoiceDialog(wxWindow *parent,
                          const wxString& message,


@@ -123,7 +116,7 @@ private:
 class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
 {
 public:
 class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
 {
 public:

-    wxMultiChoiceDialog() { }
+    wxMultiChoiceDialog();

 
     wxMultiChoiceDialog(wxWindow *parent,
                         const wxString& message,
 
     wxMultiChoiceDialog(wxWindow *parent,
                         const wxString& message,


@@ -131,10 +124,7 @@ public:
                         int n,
                         const wxString *choices,
                         long style = wxCHOICEDLG_STYLE,
                         int n,
                         const wxString *choices,
                         long style = wxCHOICEDLG_STYLE,

-                        const wxPoint& pos = wxDefaultPosition)
-    {
-        (void)Create(parent, message, caption, n, choices, style, pos);
-    }
+                        const wxPoint& pos = wxDefaultPosition);

 
     bool Create(wxWindow *parent,
                 const wxString& message,
 
     bool Create(wxWindow *parent,
                 const wxString& message,