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

copied DoGetBestSize from gtk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-11-16 21:47:22 +00:00
parent 16587f5357
commit a5235cf098
2 changed files with 104 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/mac/carbon/listbox.cpp
View File

@@ -259,13 +259,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
} }
SetListSelectionFlags((ListHandle)m_macList, options); SetListSelectionFlags((ListHandle)m_macList, options);
MacPostControlCreate() ;
for ( int i = 0 ; i < n ; i++ ) for ( int i = 0 ; i < n ; i++ )
{ {
Append( choices[i] ) ; Append( choices[i] ) ;
} }
MacPostControlCreate() ;
LSetDrawingMode( true , (ListHandle)m_macList ) ; LSetDrawingMode( true , (ListHandle)m_macList ) ;
return TRUE; return TRUE;
@@ -616,7 +616,56 @@ void wxListBox::SetString(int N, const wxString& s)
wxSize wxListBox::DoGetBestSize() const wxSize wxListBox::DoGetBestSize() const
{ {
return wxSize(100, 100); int lbWidth = 100; // some defaults
int lbHeight = 110;
int wLine;
{
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
Rect drawRect ;
#if TARGET_CARBON
int sizeFont = 12;
Str255 fontName ;
SInt16 fontSize ;
Style fontStyle ;
SInt16 fontNum ;
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetFNum(fontName , &fontNum ) ;
if ( 1 )
{
::TextFont( fontNum ) ;
::TextSize( fontSize );
::TextFace( fontStyle ) ;
}
else
#endif
{
::TextFont( kFontIDMonaco ) ;
::TextSize( 9 );
::TextFace( 0 ) ;
}
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
lbWidth = wxMax(lbWidth, wLine);
}
// Add room for the scrollbar
lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// And just a bit more
int cy = 12 ;
// don't make the listbox too tall (limit height to around 10 items) but don't
// make it too small neither
lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
}
return wxSize(lbWidth, lbHeight);
} }
int wxListBox::GetCount() const int wxListBox::GetCount() const

55
src/mac/listbox.cpp
View File

@@ -259,13 +259,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
} }
SetListSelectionFlags((ListHandle)m_macList, options); SetListSelectionFlags((ListHandle)m_macList, options);
MacPostControlCreate() ;
for ( int i = 0 ; i < n ; i++ ) for ( int i = 0 ; i < n ; i++ )
{ {
Append( choices[i] ) ; Append( choices[i] ) ;
} }
MacPostControlCreate() ;
LSetDrawingMode( true , (ListHandle)m_macList ) ; LSetDrawingMode( true , (ListHandle)m_macList ) ;
return TRUE; return TRUE;
@@ -616,7 +616,56 @@ void wxListBox::SetString(int N, const wxString& s)
wxSize wxListBox::DoGetBestSize() const wxSize wxListBox::DoGetBestSize() const
{ {
return wxSize(100, 100); int lbWidth = 100; // some defaults
int lbHeight = 110;
int wLine;
{
wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef) MacGetRootWindow() ) ) ;
Rect drawRect ;
#if TARGET_CARBON
int sizeFont = 12;
Str255 fontName ;
SInt16 fontSize ;
Style fontStyle ;
SInt16 fontNum ;
GetThemeFont(kThemeViewsFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetFNum(fontName , &fontNum ) ;
if ( 1 )
{
::TextFont( fontNum ) ;
::TextSize( fontSize );
::TextFace( fontStyle ) ;
}
else
#endif
{
::TextFont( kFontIDMonaco ) ;
::TextSize( 9 );
::TextFace( 0 ) ;
}
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
lbWidth = wxMax(lbWidth, wLine);
}
// Add room for the scrollbar
lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
// And just a bit more
int cy = 12 ;
// don't make the listbox too tall (limit height to around 10 items) but don't
// make it too small neither
lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
}
return wxSize(lbWidth, lbHeight);
} }
int wxListBox::GetCount() const int wxListBox::GetCount() const