applied patch to make wxGLCanvas derive from wxWindow, not wxScrolledWindow (Paul...

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index ff12c18d9233fd127ba9997dd65dbdee499e8253..c1f264b3bb03132510a7f09b3f32552caf981105 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -105,7 +105,7 @@ public:
     void OnListBoxDClick(wxCommandEvent& event);
 
     // old, deprecated methods
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
     wxSingleChoiceDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& caption,
@@ -164,14 +164,13 @@ public:
     wxArrayInt GetSelections() const { return m_selections; }
 
     // implementation from now on
-    void OnOK(wxCommandEvent& event);
+    virtual bool TransferDataFromWindow();
 
 protected:
     wxArrayInt m_selections;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxMultiChoiceDialog)
-    DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------
@@ -272,6 +271,8 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
 // deprecated
 // ----------------------------------------------------------------------------
 
+#if WXWIN_COMPATIBILITY_2
+
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        int n, wxChar *choices[],
@@ -303,5 +304,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         int height = wxCHOICE_HEIGHT);
 
 
+#endif // WXWIN_COMPATIBILITY_2
+
 #endif // __CHOICEDLGH_G__