Added wxWindowBase::CentreOnParent to allow top level windows to be

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 28517d704e57cbba20e1dd79bfbe9571d58696cc..7295334639c8733be6d9b65bd1b0c1e350cc626d 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -29,21 +29,23 @@ class WXDLLEXPORT wxSingleChoiceDialog: public wxDialog
 DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
 public:
     wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
 DECLARE_DYNAMIC_CLASS(wxSingleChoiceDialog)
 public:
     wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,

-        const int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        int n, const wxString *choices, wxChar **clientData = (wxChar **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);

 
     wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption,
 
     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, wxChar **clientData = (wxChar **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);

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

-        const int n, const wxString *choices, char **clientData = NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
+        int n, const wxString *choices, wxChar **clientData = (wxChar **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);

     bool Create(wxWindow *parent, const wxString& message, const wxString& caption,
     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, wxChar **clientData = (wxChar **) NULL, long style = wxOK|wxCANCEL|wxCENTRE, const wxPoint& pos = wxDefaultPosition);

 
 

+    void SetSelection(int sel) ;

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

-    inline char *GetSelectionClientData(void) const { return m_clientData; }
+    inline wxChar *GetSelectionClientData(void) const { return m_clientData; }

 
     void OnOK(wxCommandEvent& event);
 
     void OnOK(wxCommandEvent& event);

+    void OnListBoxDClick(wxCommandEvent& event);

 
 DECLARE_EVENT_TABLE()
 
 
 DECLARE_EVENT_TABLE()
 


@@ -51,50 +53,50 @@ protected:
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;
     long        m_dialogStyle;
     int         m_selection;
     wxString    m_stringSelection;

-    char*       m_clientData;
+    wxChar*     m_clientData;

 };
 
 };
 

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

 
 // Same as above but gets position in list of strings, instead of string,
 // or -1 if no selection
 
 // 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,
-                           const int n, const wxString *choices, wxWindow *parent = NULL,
-                           const int x = -1, const int y = -1, const bool centre = TRUE,
-                           const int width = wxCHOICE_WIDTH, const int height = wxCHOICE_HEIGHT);
+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,
-                           const int n, char *choices[], wxWindow *parent = NULL,
-                           const int x = -1, const int y = -1, const bool centre = TRUE,
-                           const int width = wxCHOICE_WIDTH, const 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);

 
 // Return client data instead
 
 // Return client data instead

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

 */
 
 #endif
 */
 
 #endif