Avoid needless second string conversion when adding files to memory FS.

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

diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index af438253f389decacdac190bcaed321e40ab43f9..268f247573b07e4862f11f716e5f74a136a245e7 100644 (file)
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -36,6 +36,18 @@ public:
     */
     virtual bool Create(wxWindow* parent) = 0;
 
     */
     virtual bool Create(wxWindow* parent) = 0;
 

+    /**
+        You only need to implement this member function if you create
+        your popup class in non-standard way. The default implementation can
+        handle both multiple-inherited popup control (as seen in wxComboCtrl
+        samples) and one allocated separately in heap.
+
+        If you do completely re-implement this function, make sure it calls
+        Destroy() for the popup control and also deletes @a this object
+        (usually as the last thing).
+    */
+    virtual void DestroyPopup();
+

     /**
         Utility function that hides the popup.
     */
     /**
         Utility function that hides the popup.
     */


@@ -304,7 +316,7 @@ struct wxComboCtrlFeatures
     @style{wxCB_SORT}
            Sorts the entries in the list alphabetically.
     @style{wxTE_PROCESS_ENTER}
     @style{wxCB_SORT}
            Sorts the entries in the list alphabetically.
     @style{wxTE_PROCESS_ENTER}

-           The control will generate the event wxEVT_COMMAND_TEXT_ENTER
+           The control will generate the event @c wxEVT_COMMAND_TEXT_ENTER

            (otherwise pressing Enter key is either processed internally by the
            control or used for navigation between dialog controls). Windows
            only.
            (otherwise pressing Enter key is either processed internally by the
            control or used for navigation between dialog controls). Windows
            only.


@@ -319,15 +331,15 @@ struct wxComboCtrlFeatures
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_TEXT(id, func)}
 
     @beginEventEmissionTable{wxCommandEvent}
     @event{EVT_TEXT(id, func)}

-           Process a wxEVT_COMMAND_TEXT_UPDATED event, when the text changes.
+           Process a @c wxEVT_COMMAND_TEXT_UPDATED event, when the text changes.

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

-           Process a wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in
+           Process a @c wxEVT_COMMAND_TEXT_ENTER event, when RETURN is pressed in

            the combo control.
     @event{EVT_COMBOBOX_DROPDOWN(id, func)}
            the combo control.
     @event{EVT_COMBOBOX_DROPDOWN(id, func)}

-           Process a wxEVT_COMMAND_COMBOBOX_DROPDOWN event, which is generated
+           Process a @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event, which is generated

            when the popup window is shown (drops down).
     @event{EVT_COMBOBOX_CLOSEUP(id, func)}
            when the popup window is shown (drops down).
     @event{EVT_COMBOBOX_CLOSEUP(id, func)}

-           Process a wxEVT_COMMAND_COMBOBOX_CLOSEUP event, which is generated
+           Process a @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event, which is generated

            when the popup window of the combo control disappears (closes up).
            You should avoid adding or deleting items in this event.
     @endEventTable
            when the popup window of the combo control disappears (closes up).
            You should avoid adding or deleting items in this event.
     @endEventTable


@@ -412,7 +424,7 @@ public:
         Dismisses the popup window.
 
         Notice that calling this function will generate a
         Dismisses the popup window.
 
         Notice that calling this function will generate a

-        wxEVT_COMMAND_COMBOBOX_CLOSEUP event.
+        @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event.

 
         @since 2.9.2
     */
 
         @since 2.9.2
     */


@@ -554,7 +566,7 @@ public:
 
         @param generateEvent
             Set this to @true in order to generate
 
         @param generateEvent
             Set this to @true in order to generate

-            wxEVT_COMMAND_COMBOBOX_CLOSEUP event.
+            @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event.

 
         @deprecated Use Dismiss() instead.
     */
 
         @deprecated Use Dismiss() instead.
     */


@@ -597,7 +609,7 @@ public:
         Shows the popup portion of the combo control.
 
         Notice that calling this function will generate a
         Shows the popup portion of the combo control.
 
         Notice that calling this function will generate a

-        wxEVT_COMMAND_COMBOBOX_DROPDOWN event.
+        @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event.

 
         @since 2.9.2
     */
 
         @since 2.9.2
     */


@@ -813,7 +825,7 @@ public:
 
     /**
         Same as SetValue(), but also sends wxCommandEvent of type
 
     /**
         Same as SetValue(), but also sends wxCommandEvent of type

-        wxEVT_COMMAND_TEXT_UPDATED if @a withEvent is @true.
+        @c wxEVT_COMMAND_TEXT_UPDATED if @a withEvent is @true.

     */
     void SetValueWithEvent(const wxString& value, bool withEvent = true);
 
     */
     void SetValueWithEvent(const wxString& value, bool withEvent = true);
 


@@ -856,7 +868,7 @@ protected:
     /**
         This member function is not normally called in application code.
         Instead, it can be implemented in a derived class to return default
     /**
         This member function is not normally called in application code.
         Instead, it can be implemented in a derived class to return default

-        wxComboPopup, incase @a popup is @NULL.
+        wxComboPopup, in case @a popup is @NULL.

 
         @note If you have implemented OnButtonClick() to do something else than
               show the popup, then DoSetPopupControl() must always set @a popup
 
         @note If you have implemented OnButtonClick() to do something else than
               show the popup, then DoSetPopupControl() must always set @a popup