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

New colour, font, theme and size code..

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-04 13:02:27 +00:00
parent bf9b671186
commit db434467a1
35 changed files with 581 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk1/choice.cpp
View File

@@ -90,8 +90,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
m_widget = gtk_option_menu_new();
SetSizeOrDefault( size );
if ( style & wxCB_SORT )
{
// if our m_strings != NULL, DoAppend() will check for it and insert
@@ -112,9 +110,21 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
PostCreation();
ApplyWidgetStyle();
SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() );
wxSize new_size( size );
if (new_size.x == -1)
new_size.x = size_best.x;
if (new_size.y == -1)
new_size.y = size_best.y;
if ((new_size.x != size.x) || (new_size.y != size.y))
SetSize( new_size.x, new_size.y );
SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() );
SetFont( parent->GetFont() );
Show( TRUE );
@@ -396,7 +406,10 @@ size_t wxChoice::GtkAppendHelper(GtkWidget *menu, const wxString& item)
wxSize wxChoice::DoGetBestSize() const
{
return wxSize(80, 26);
wxSize ret( wxControl::DoGetBestSize() );
if (ret.x < 80) ret.x = 80;
ret.y = 16 + gdk_char_height( m_widget->style->font, 'H' );
return ret;
}
#endif