support for iPhone callbacks

[wxWidgets.git] / interface / wx / odcombo.h

diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h
index 93ca6bc2d5943f1cbc9e29df2de7b166abc22235..0e639178c5d884db29916946c152d21aac43483f 100644 (file)
--- a/interface/wx/odcombo.h
+++ b/interface/wx/odcombo.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxOwnerDrawnComboBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxOwnerDrawnComboBox
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -22,6 +22,27 @@ enum wxOwnerDrawnComboBoxPaintingFlags
     wxODCB_PAINTING_SELECTED        = 0x0002
 };
 
     wxODCB_PAINTING_SELECTED        = 0x0002
 };
 

+
+/**
+   New window styles for wxOwnerDrawnComboBox
+*/
+enum
+{
+    /**
+       Double-clicking cycles item if wxCB_READONLY is also used.
+    */
+    wxODCB_DCLICK_CYCLES            = wxCC_SPECIAL_DCLICK,
+
+    /**
+       If used, control itself is not custom paint using callback.
+       Even if this is not used, writable combo is never custom paint
+       until SetCustomPaintWidth is called
+    */
+    wxODCB_STD_CONTROL_PAINT        = 0x1000
+};
+
+
+

 /**
     @class wxOwnerDrawnComboBox
 
 /**
     @class wxOwnerDrawnComboBox
 


@@ -45,9 +66,9 @@ enum wxOwnerDrawnComboBoxPaintingFlags
 
     @see wxComboCtrl window styles and @ref overview_windowstyles.
 
 
     @see wxComboCtrl window styles and @ref overview_windowstyles.
 

-    @beginEventTable{wxCommandEvent}
+    @beginEventEmissionTable{wxCommandEvent}

     @event{EVT_COMBOBOX(id, func)}
     @event{EVT_COMBOBOX(id, func)}

-           Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on
+           Process a wxEVT_COMBOBOX event, when an item on

            the list is selected. Note that calling GetValue() returns the new
            value of selection.
     @endEventTable
            the list is selected. Note that calling GetValue() returns the new
            value of selection.
     @endEventTable


@@ -56,11 +77,11 @@ enum wxOwnerDrawnComboBoxPaintingFlags
 
     @library{wxadv}
     @category{ctrl}
 
     @library{wxadv}
     @category{ctrl}

-    @appearance{ownerdrawncombobox.png}
+    @appearance{ownerdrawncombobox}

 
     @see wxComboCtrl, wxComboBox, wxVListBox, wxCommandEvent
 */
 
     @see wxComboCtrl, wxComboBox, wxVListBox, wxCommandEvent
 */

-class wxOwnerDrawnComboBox : public wxComboCtrl
+class wxOwnerDrawnComboBox : public wxComboCtrl, public wxItemContainer

 {
 public:
     /**
 {
 public:
     /**


@@ -68,7 +89,6 @@ public:
     */
     wxOwnerDrawnComboBox();
 
     */
     wxOwnerDrawnComboBox();
 

-    //@{

     /**
         Constructor, creating and showing a owner-drawn combobox.
 
     /**
         Constructor, creating and showing a owner-drawn combobox.
 


@@ -97,11 +117,11 @@ public:
         @see Create(), wxValidator
     */
     wxOwnerDrawnComboBox(wxWindow* parent, wxWindowID id,
         @see Create(), wxValidator
     */
     wxOwnerDrawnComboBox(wxWindow* parent, wxWindowID id,

-                         const wxString& value = "",
+                         const wxString& value = wxEmptyString,

                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          int n = 0,
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          int n = 0,

-                         const wxString[] choices = NULL,
+                         const wxString choices[] = NULL,

                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = "comboBox");
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = "comboBox");


@@ -138,7 +158,6 @@ public:
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = "comboBox");
                          long style = 0,
                          const wxValidator& validator = wxDefaultValidator,
                          const wxString& name = "comboBox");

-    //@}

 
     /**
         Destructor, destroying the owner-drawn combobox.
 
     /**
         Destructor, destroying the owner-drawn combobox.


@@ -152,22 +171,33 @@ public:
 
         @remarks Derived classes should call or replace this function.
     */
 
         @remarks Derived classes should call or replace this function.
     */

-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxString& value = "",
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                int n, const wxString choices[],

                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "comboBox");
-    bool Create(wxWindow* parent, wxWindowID id,
+                const wxString& name = wxComboBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                int n,
+                const wxString choices[],
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,

                 const wxString& value,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& value,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = "comboBox");
+                const wxString& name = wxComboBoxNameStr);

     //@}
 
     /**
     //@}
 
     /**


@@ -180,6 +210,8 @@ public:
     */
     virtual int GetWidestItemWidth();
 
     */
     virtual int GetWidestItemWidth();
 

+protected:
+

     /**
         This method is used to draw the items background and, maybe, a border around it.
 
     /**
         This method is used to draw the items background and, maybe, a border around it.