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

fudged the extra width in GetBestSize() to fit better

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-27 16:15:25 +00:00
parent 5f95bb7096
commit df336b7f25
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/choice.cpp
View File

@@ -114,14 +114,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
SetFont( parent->GetFont() ); SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() ); SetBestSize(size);
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() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
@@ -424,8 +417,17 @@ wxSize wxChoice::DoGetBestSize() const
ret.x = width; ret.x = width;
} }
// for the choice "=" button // add extra for the choice "=" button
ret.x += 20;
// VZ: I don't know how to get the right value, it seems to be in
// GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get
// to it - maybe we can use gtk_option_menu_size_request() for this
// somehow?
//
// This default value works only for the default GTK+ theme (i.e.
// no theme at all) (FIXME)
static const int widthChoiceIndicator = 35;
ret.x += widthChoiceIndicator;
} }
// but not less than the minimal width // but not less than the minimal width
@@ -436,4 +438,5 @@ wxSize wxChoice::DoGetBestSize() const
return ret; return ret;
} }
#endif #endif // wxUSE_CHOICE

25
src/gtk1/choice.cpp
View File

@@ -114,14 +114,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
SetFont( parent->GetFont() ); SetFont( parent->GetFont() );
wxSize size_best( DoGetBestSize() ); SetBestSize(size);
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() ); SetBackgroundColour( parent->GetBackgroundColour() );
SetForegroundColour( parent->GetForegroundColour() ); SetForegroundColour( parent->GetForegroundColour() );
@@ -424,8 +417,17 @@ wxSize wxChoice::DoGetBestSize() const
ret.x = width; ret.x = width;
} }
// for the choice "=" button // add extra for the choice "=" button
ret.x += 20;
// VZ: I don't know how to get the right value, it seems to be in
// GtkOptionMenuProps struct from gtkoptionmenu.c but we can't get
// to it - maybe we can use gtk_option_menu_size_request() for this
// somehow?
//
// This default value works only for the default GTK+ theme (i.e.
// no theme at all) (FIXME)
static const int widthChoiceIndicator = 35;
ret.x += widthChoiceIndicator;
} }
// but not less than the minimal width // but not less than the minimal width
@@ -436,4 +438,5 @@ wxSize wxChoice::DoGetBestSize() const
return ret; return ret;
} }
#endif #endif // wxUSE_CHOICE