From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sun, 22 Feb 2009 15:13:29 +0000 (+0000)
Subject: Added wxComboPopup::GetComboCtrl()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8c61a9ea94cdb1fde0dbb98d77e2e8a5f10a07e7

Added wxComboPopup::GetComboCtrl()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 658861ce13..2ac66cda0a 100644
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -644,6 +644,8 @@ enum
     wxCP_IFLAG_CREATED      = 0x0001 // Set by wxComboCtrlBase after Create is called
 };
 
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
+
 
 class WXDLLIMPEXP_CORE wxComboPopup
 {
@@ -721,6 +723,9 @@ public:
         return (m_iFlags & wxCP_IFLAG_CREATED) ? true : false;
     }
 
+    // Returns pointer to the associated parent wxComboCtrl.
+    wxComboCtrl* GetComboCtrl() const;
+
     // Default PaintComboControl behaviour
     static void DefaultPaintComboControl( wxComboCtrlBase* combo,
                                           wxDC& dc,
diff --git a/interface/wx/combo.h b/interface/wx/combo.h
index 4cfafc2598..4bcc4c9988 100644
--- a/interface/wx/combo.h
+++ b/interface/wx/combo.h
@@ -56,6 +56,11 @@ public:
     */
     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().
diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 06b3cf23ce..17b6a37663 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -499,6 +499,11 @@ void wxComboPopup::OnDismiss()
 {
 }
 
+wxComboCtrl* wxComboPopup::GetComboCtrl() const
+{
+    return wxStaticCast(m_combo, wxComboCtrl);
+}
+
 wxSize wxComboPopup::GetAdjustedSize( int minWidth,
                                       int prefHeight,
                                       int WXUNUSED(maxHeight) )