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

Sizing fixes for generic control.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-11-02 18:17:24 +00:00
parent 36cb9ebe32
commit a6c82d64ce
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/carbon/listctrl.h
View File

@@ -331,6 +331,8 @@ protected:
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO);
virtual wxSize DoGetBestSize() const;
// common part of all ctors // common part of all ctors
void Init(); void Init();

10
src/mac/carbon/listctrl_mac.cpp
View File

@@ -397,7 +397,7 @@ bool wxListCtrl::Create(wxWindow *parent,
{ {
m_macIsUserPane = true; m_macIsUserPane = true;
if ( !wxWindow::Create(parent, id, pos, size, style, name) ) if ( !wxWindow::Create(parent, id, pos, size, style & wxNO_BORDER, name) )
return false; return false;
m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name); m_genericImpl = new wxGenericListCtrlHook(this, id, pos, size, style, validator, name);
m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) ); m_genericImpl->PushEventHandler( new wxMacListCtrlEventDelegate( this, GetId() ) );
@@ -490,6 +490,14 @@ void wxListCtrl::DoSetSize( int x, int y, int width, int height, int sizeFlags )
m_genericImpl->SetSize(x, y, width, height, sizeFlags); m_genericImpl->SetSize(x, y, width, height, sizeFlags);
} }
wxSize wxListCtrl::DoGetBestSize() const
{
if (m_genericImpl)
return m_genericImpl->GetBestSize();
return wxWindow::DoGetBestSize();
}
bool wxListCtrl::SetFont(const wxFont& font) bool wxListCtrl::SetFont(const wxFont& font)
{ {
bool rv = true; bool rv = true;