wxDC::StretchBlit() for wxMac and wxMSW (patch 1611973)

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

diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h
index 6678bc16b4357ffefd2a2f0e615a22156ba1a297..99b2367741418239bd5774ea38d8fb2e846e001a 100644 (file)
--- a/include/wx/generic/choicdgg.h
+++ b/include/wx/generic/choicdgg.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __CHOICEDLGH_G__
-#define __CHOICEDLGH_G__
+#ifndef _WX_GENERIC_CHOICDGG_H_
+#define _WX_GENERIC_CHOICDGG_H_

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

-class WXDLLEXPORT wxListBox;
+class WXDLLEXPORT wxListBoxBase;

 
 // ----------------------------------------------------------------------------
 // some (ugly...) constants
 
 // ----------------------------------------------------------------------------
 // some (ugly...) constants


@@ -80,7 +80,11 @@ public:
                 long styleLbox = wxLB_ALWAYS_SB);
 
 protected:
                 long styleLbox = wxLB_ALWAYS_SB);
 
 protected:

-    wxListBox  *m_listbox;
+    wxListBoxBase *m_listbox;
+
+    virtual wxListBoxBase *CreateList(int n,
+                                      const wxString *choices,
+                                      long styleLbox);

 
     DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };
 
     DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };


@@ -206,6 +210,12 @@ public:
     virtual bool TransferDataFromWindow();
 
 protected:
     virtual bool TransferDataFromWindow();
 
 protected:

+#if wxUSE_CHECKLISTBOX
+    virtual wxListBoxBase *CreateList(int n,
+                                      const wxString *choices,
+                                      long styleLbox);
+#endif // wxUSE_CHECKLISTBOX
+

     wxArrayInt m_selections;
 
 private:
     wxArrayInt m_selections;
 
 private:


@@ -220,7 +230,7 @@ private:
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,

-                                       wxWindow *parent = (wxWindow *) NULL,
+                                       wxWindow *parent = NULL,

                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,


@@ -230,7 +240,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
 WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,

-                                       wxWindow *parent = (wxWindow *) NULL,
+                                       wxWindow *parent = NULL,

                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,


@@ -242,7 +252,7 @@ WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
 WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
 WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,

-                                       wxWindow *parent = (wxWindow *) NULL,
+                                       wxWindow *parent = NULL,

                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,


@@ -252,7 +262,7 @@ WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
 WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
 WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,

-                                       wxWindow *parent = (wxWindow *) NULL,
+                                       wxWindow *parent = NULL,

                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int x = wxDefaultCoord,
                                        int y = wxDefaultCoord,
                                        bool centre = true,


@@ -264,7 +274,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         void **client_data,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         void **client_data,

-                                        wxWindow *parent = (wxWindow *) NULL,
+                                        wxWindow *parent = NULL,

                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,


@@ -275,7 +285,7 @@ WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         void **client_data,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         void **client_data,

-                                        wxWindow *parent = (wxWindow *) NULL,
+                                        wxWindow *parent = NULL,

                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,


@@ -289,7 +299,7 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& message,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         const wxString& message,
                                         const wxString& caption,
                                         int n, const wxString *choices,

-                                        wxWindow *parent = (wxWindow *) NULL,
+                                        wxWindow *parent = NULL,

                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,


@@ -300,11 +310,11 @@ WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& message,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         const wxString& message,
                                         const wxString& caption,
                                         const wxArrayString& choices,

-                                        wxWindow *parent = (wxWindow *) NULL,
+                                        wxWindow *parent = NULL,

                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 
                                         int x = wxDefaultCoord,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 

-#endif // __CHOICEDLGH_G__
+#endif // _WX_GENERIC_CHOICDGG_H_