avoid infinite recursion for richtooltops, (hopefully) fixes #15070

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

diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index d6e219350e85bc6d10155b6471cdf0e9dd9c580b..2238961d63bedbf8d120be2ac215f25f00ff0aa1 100644 (file)
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -6,6 +6,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+//
+// New window styles for wxComboCtrlBase
+//
+enum
+{
+    // Double-clicking a read-only combo triggers call to popup's OnComboPopup.
+    // In wxOwnerDrawnComboBox, for instance, it cycles item.
+    wxCC_SPECIAL_DCLICK             = 0x0100,
+
+    // Dropbutton acts like standard push button.
+    wxCC_STD_BUTTON                 = 0x0200
+};
+
+

 /**
     @class wxComboPopup
 
 /**
     @class wxComboPopup
 


@@ -344,9 +358,9 @@ struct wxComboCtrlFeatures
            You should avoid adding or deleting items in this event.
     @endEventTable
 
            You should avoid adding or deleting items in this event.
     @endEventTable
 

-    @library{wxbase}
+    @library{wxcore}

     @category{ctrl}
     @category{ctrl}

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

 
     @see wxComboBox, wxChoice, wxOwnerDrawnComboBox, wxComboPopup,
          wxCommandEvent
 
     @see wxComboBox, wxChoice, wxOwnerDrawnComboBox, wxComboPopup,
          wxCommandEvent


@@ -437,6 +451,35 @@ public:
     */
     void EnablePopupAnimation(bool enable = true);
 
     */
     void EnablePopupAnimation(bool enable = true);
 

+    
+    /**
+       Returns true if given key combination should toggle the popup.
+    */
+    virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
+
+
+    /**
+       Prepare background of combo control or an item in a dropdown list in a
+       way typical on platform. This includes painting the focus/disabled
+       background and setting the clipping region.
+
+       Unless you plan to paint your own focus indicator, you should always
+       call this in your wxComboPopup::PaintComboControl implementation.  In
+       addition, it sets pen and text colour to what looks good and proper
+       against the background.
+
+       flags: wxRendererNative flags:
+              wxCONTROL_ISSUBMENU: is drawing a list item instead of combo control
+              wxCONTROL_SELECTED: list item is selected
+              wxCONTROL_DISABLED: control/item is disabled
+    */
+    virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const;
+
+    /**
+       Returns true if focus indicator should be drawn in the control.
+    */
+    bool ShouldDrawFocus() const;
+

     /**
         Returns disabled button bitmap that has been set with
         SetButtonBitmaps().
     /**
         Returns disabled button bitmap that has been set with
         SetButtonBitmaps().


@@ -694,7 +737,7 @@ public:
 
         @since 2.9.1
     */
 
         @since 2.9.1
     */

-    virtual void SetHint(const wxString& hint);
+    virtual bool SetHint(const wxString& hint);

 
     /**
         Sets the insertion point in the text field.
 
     /**
         Sets the insertion point in the text field.


@@ -823,6 +866,12 @@ public:
     */
     virtual void SetValue(const wxString& value);
 
     */
     virtual void SetValue(const wxString& value);
 

+    /**
+       Changes value of the control as if user had done it by selecting an
+       item from a combo box drop-down list.
+     */
+    void SetValueByUser(const wxString& value);
+

     /**
         Show the popup.
 
     /**
         Show the popup.