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 c2e3cc51dc91aebd32863fdded44c1a01452dfab..d583b4f48932289d9380b0b5d70bd2349f3b2cff 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -12,7 +12,7 @@
 #ifndef __CHOICEDLGH_G__
 #define __CHOICEDLGH_G__
 
 #ifndef __CHOICEDLGH_G__
 #define __CHOICEDLGH_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "choicdgg.h"
 #endif
 
     #pragma interface "choicdgg.h"
 #endif
 


@@ -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,


@@ -107,31 +100,12 @@ public:
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);
 
     void OnOK(wxCommandEvent& event);
     void OnListBoxDClick(wxCommandEvent& event);
 

-    // old, deprecated methods
-#if WXWIN_COMPATIBILITY_2
-    wxSingleChoiceDialog(wxWindow *parent,
-                         const wxString& message,
-                         const wxString& caption,
-                         const wxStringList& choices,
-                         char **clientData = (char **)NULL,
-                         long style = wxCHOICEDLG_STYLE,
-                         const wxPoint& pos = wxDefaultPosition);
-
-    bool Create(wxWindow *parent,
-                const wxString& message,
-                const wxString& caption,
-                const wxStringList& choices,
-                char **clientData = (char **)NULL,
-                long style = wxCHOICEDLG_STYLE,
-                const wxPoint& pos = wxDefaultPosition);
-#endif // WXWIN_COMPATIBILITY_2
-

 protected:
     int         m_selection;
     wxString    m_stringSelection;
 
 private:
 protected:
     int         m_selection;
     wxString    m_stringSelection;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSingleChoiceDialog)

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -142,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,


@@ -150,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,


@@ -173,7 +144,7 @@ protected:
     wxArrayInt m_selections;
 
 private:
     wxArrayInt m_selections;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMultiChoiceDialog)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -269,45 +240,5 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 

-// ----------------------------------------------------------------------------
-// these methods are for backwards compatibility only, not documented and
-// deprecated
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2
-
-WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
-                                       const wxString& caption,
-                                       int n, wxChar *choices[],
-                                       wxWindow *parent = (wxWindow *) NULL,
-                                       int x = -1,
-                                       int y = -1,
-                                       bool centre = TRUE,
-                                       int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT);
-
-WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
-                                       const wxString& caption,
-                                       int n, wxChar *choices[],
-                                       wxWindow *parent = (wxWindow *) NULL,
-                                       int x = -1,
-                                       int y = -1,
-                                       bool centre = TRUE,
-                                       int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT);
-
-WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
-                                        const wxString& caption,
-                                        int n, wxChar **choices,
-                                        void **client_data,
-                                        wxWindow *parent = (wxWindow *) NULL,
-                                        int x = -1, int y = -1,
-                                        bool centre = TRUE,
-                                        int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT);
-
-
-#endif // WXWIN_COMPATIBILITY_2
-

 #endif // __CHOICEDLGH_G__
 
 #endif // __CHOICEDLGH_G__