wxFileDialog::GetFilename and GetDir work now

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index d97d77ba7909b3150b6493e22edfd7392b2324d2..1f0ba8dacf97d1e1ee0a709d2096459298f7b4e2 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -29,15 +29,15 @@ class WXDLLEXPORT wxSingleChoiceDialog: public wxDialog
 DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
 public:
     wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        int n, const wxString *choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
-        const wxStringList& choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     bool Create(wxWindow *parent, const wxString& message, const wxString& caption,
-        int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        int n, const wxString *choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
     bool Create(wxWindow *parent, const wxString& message, const wxString& caption,
-        const wxStringList& choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        const wxStringList& choices, char **clientData = (char **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel) ;
     inline int GetSelection(void) const { return m_selection; }
@@ -56,43 +56,43 @@ protected:
     char*       m_clientData;
 };
 
-wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
-                        int n, const wxString *choices, wxWindow *parent = NULL,
+WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
+                        int n, const wxString *choices, wxWindow *parent = (wxWindow *) NULL,
                         int x = -1, int y = -1, bool centre = TRUE,
                         int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
-wxString WXDLLEXPORT wxGetSingleChoice(const wxString& message, const wxString& caption,
-                        int n, char *choices[], wxWindow *parent = NULL,
+WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
+                        int n, char *choices[], wxWindow *parent = (wxWindow *) NULL,
                         int x = -1, int y = -1, bool centre = TRUE,
                         int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
 // Same as above but gets position in list of strings, instead of string,
 // or -1 if no selection
-int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
-                           int n, const wxString *choices, wxWindow *parent = NULL,
+WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
+                           int n, const wxString *choices, wxWindow *parent = (wxWindow *) NULL,
                            int x = -1, int y = -1, bool centre = TRUE,
                            int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
-int WXDLLEXPORT wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
-                           int n, char *choices[], wxWindow *parent = NULL,
+WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
+                           int n, char *choices[], wxWindow *parent = (wxWindow *) NULL,
                            int x = -1, int y = -1, bool centre = TRUE,
                            int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
 // Return client data instead
-char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
+WXDLLEXPORT char* wxGetSingleChoiceData(const wxString& message, const wxString& caption,
                             int n, const wxString *choices, char **client_data,
-                            wxWindow *parent = NULL, int x = -1, int y = -1,
+                            wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
                             bool centre = TRUE,
                             int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
-char* WXDLLEXPORT wxGetSingleChoiceData(const wxString& message, const wxString& caption,
+WXDLLEXPORT char* wxGetSingleChoiceData(const wxString& message, const wxString& caption,
                             int n, char *choices[], char **client_data,
-                            wxWindow *parent = NULL, int x = -1, int y = -1,
+                            wxWindow *parent = (wxWindow *) NULL, int x = -1, int y = -1,
                             bool centre = TRUE,
                             int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT);
 
 /*
-int WXDLLEXPORT wxGetMultipleChoice(const wxString& message, const wxString& caption,
+WXDLLEXPORT int wxGetMultipleChoice(const wxString& message, const wxString& caption,
                          int n, const wxString *choices,
                          int nsel, int * selection,
                          wxWindow *parent = NULL, int x = -1 , int y = -1, bool centre = TRUE,