Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxComboPopup::GetComboCtrl()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-02-22 15:13:29 +00:00
parent 1f2f732921
commit 8c61a9ea94
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/combo.h
View File

@@ -644,6 +644,8 @@ enum
wxCP_IFLAG_CREATED = 0x0001 // Set by wxComboCtrlBase after Create is called wxCP_IFLAG_CREATED = 0x0001 // Set by wxComboCtrlBase after Create is called
}; };
class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
class WXDLLIMPEXP_CORE wxComboPopup class WXDLLIMPEXP_CORE wxComboPopup
{ {
@@ -721,6 +723,9 @@ public:
return (m_iFlags & wxCP_IFLAG_CREATED) ? true : false; return (m_iFlags & wxCP_IFLAG_CREATED) ? true : false;
} }
// Returns pointer to the associated parent wxComboCtrl.
wxComboCtrl* GetComboCtrl() const;
// Default PaintComboControl behaviour // Default PaintComboControl behaviour
static void DefaultPaintComboControl( wxComboCtrlBase* combo, static void DefaultPaintComboControl( wxComboCtrlBase* combo,
wxDC& dc, wxDC& dc,

5
interface/wx/combo.h
View File

@@ -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 The derived class must implement this to return pointer to the
associated control created in Create(). associated control created in Create().

5
src/common/combocmn.cpp
View File

@@ -499,6 +499,11 @@ void wxComboPopup::OnDismiss()
{ {
} }
wxComboCtrl* wxComboPopup::GetComboCtrl() const
{
return wxStaticCast(m_combo, wxComboCtrl);
}
wxSize wxComboPopup::GetAdjustedSize( int minWidth, wxSize wxComboPopup::GetAdjustedSize( int minWidth,
int prefHeight, int prefHeight,
int WXUNUSED(maxHeight) ) int WXUNUSED(maxHeight) )