reset the associated view frame pointer when the frame is deleted directly instead...

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

diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index 78a3dca7fc77038cb724bf3288502932ecee4ab0..4bcc4c9988cf864c790ce26416267c5a3074fc57 100644 (file)
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -56,6 +56,11 @@ public:
     */
     virtual wxSize GetAdjustedSize(int minWidth, int prefHeight, int maxHeight);
 
     */
     virtual wxSize GetAdjustedSize(int minWidth, int prefHeight, int maxHeight);
 

+    /**
+        Returns pointer to the associated parent wxComboCtrl.
+    */
+    wxComboCtrl* GetComboCtrl() const;
+

     /**
         The derived class must implement this to return pointer to the
         associated control created in Create().
     /**
         The derived class must implement this to return pointer to the
         associated control created in Create().


@@ -131,11 +136,12 @@ public:
     */
     virtual void SetStringValue(const wxString& value);
 
     */
     virtual void SetStringValue(const wxString& value);
 

+protected:

     /**
     /**

-        Parent wxComboCtrl. This is parameter has been prepared before Init()
-        is called.
+        Parent wxComboCtrl. This member variable is prepared automatically
+        before Init() is called.

     */
     */

-    wxComboCtrl m_combo;
+    wxComboCtrl*    m_combo;

 };
 
 
 };
 
 


@@ -264,6 +270,7 @@ struct wxComboCtrlFeatures
 
     wxListViewComboPopup* popupCtrl = new wxListViewComboPopup();
 
 
     wxListViewComboPopup* popupCtrl = new wxListViewComboPopup();
 

+    // It is important to call SetPopupControl() as soon as possible

     comboCtrl->SetPopupControl(popupCtrl);
 
     // Populate using wxListView methods
     comboCtrl->SetPopupControl(popupCtrl);
 
     // Populate using wxListView methods


@@ -291,7 +298,7 @@ struct wxComboCtrlFeatures
            Drop button will behave more like a standard push button.
     @endStyleTable
 
            Drop button will behave more like a standard push button.
     @endStyleTable
 

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

     @event{EVT_TEXT(id, func)}
            Process a wxEVT_COMMAND_TEXT_UPDATED event, when the text changes.
     @event{EVT_TEXT_ENTER(id, func)}
     @event{EVT_TEXT(id, func)}
            Process a wxEVT_COMMAND_TEXT_UPDATED event, when the text changes.
     @event{EVT_TEXT_ENTER(id, func)}