wxMenu::callback stuff taken inside WXWIN_COMPATIBILITY_2 (everybody should

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 2d817c474c499e4438a326e05e4385a2a9598b16..7dbf48525ab792c55b44f52111438324bfbf7ab4 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -16,14 +16,14 @@
     #pragma interface "choicdgg.h"
 #endif
 
     #pragma interface "choicdgg.h"
 #endif
 

-#include "wx/setup.h"

 #include "wx/dialog.h"
 #include "wx/dialog.h"

-#include "wx/listbox.h"
+
+class WXDLLEXPORT wxListBox;

 
 #define wxCHOICE_HEIGHT 150
 #define wxCHOICE_WIDTH 200
 
 
 #define wxCHOICE_HEIGHT 150
 #define wxCHOICE_WIDTH 200
 

-#define wxCHOICEDLG_STYLE (wxOK | wxCANCEL | wxCENTRE)
+#define wxCHOICEDLG_STYLE (wxDEFAULT_DIALOG_STYLE|wxOK | wxCANCEL | wxCENTRE)

 
 class WXDLLEXPORT wxSingleChoiceDialog: public wxDialog
 {
 
 class WXDLLEXPORT wxSingleChoiceDialog: public wxDialog
 {


@@ -64,13 +64,10 @@ public:
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
 
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
 

-    void SetSelection(int sel) ;
+    void SetSelection(int sel);

     int GetSelection() const { return m_selection; }
     wxString GetStringSelection() const { return m_stringSelection; }
 
     int GetSelection() const { return m_selection; }
     wxString GetStringSelection() const { return m_stringSelection; }
 

-    // get client data associated with selection
-    void *GetClientData() const { return m_clientData; }
-

     // obsolete function (NB: no need to make it return wxChar, it's untyped)
     char *GetSelectionClientData() const { return (char *)m_clientData; }
 
     // obsolete function (NB: no need to make it return wxChar, it's untyped)
     char *GetSelectionClientData() const { return (char *)m_clientData; }
 


@@ -111,15 +108,14 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, const wxString&
                            int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
 // Return client data instead
                            int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
 // Return client data instead

-// FIXME: this is horrible, using "char *" instead of "void *" belongs to the 70s!
-WXDLLEXPORT wxChar* wxGetSingleChoiceData(const wxString& message, const wxString& caption,
-                            int n, const wxString *choices, char **client_data,
+WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message, const wxString& caption,
+                            int n, const wxString *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);
 
                             wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
                             bool centre = TRUE,
                             int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 

-WXDLLEXPORT wxChar* wxGetSingleChoiceData(const wxString& message, const wxString& caption,
-                            int n, wxChar *choices[], char **client_data,
+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);
                             wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
                             bool centre = TRUE,
                             int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);