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

implemented GetBestSize()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-01 13:55:21 +00:00
parent c7e111cd98
commit c4ca49cde3
4 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/radiobox.h
View File

@@ -122,7 +122,10 @@ public:
#if wxUSE_TOOLTIPS
void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
#endif // wxUSE_TOOLTIPS
wxSize LayoutItems();
// reposition the radio buttons correctly unless justCalc == true and
// reutrn the total size needed to accomodate them
wxSize LayoutItems(bool justCalc) const;
virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
virtual void OnInternalIdle();
@@ -133,6 +136,9 @@ public:
wxList m_boxes;
protected:
// implement some base class methods
virtual wxSize DoGetBestSize() const;
// common part of all ctors
void Init();

8
include/wx/gtk1/radiobox.h
View File

@@ -122,7 +122,10 @@ public:
#if wxUSE_TOOLTIPS
void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
#endif // wxUSE_TOOLTIPS
wxSize LayoutItems();
// reposition the radio buttons correctly unless justCalc == true and
// reutrn the total size needed to accomodate them
wxSize LayoutItems(bool justCalc) const;
virtual void DoSetSize( int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO );
virtual void OnInternalIdle();
@@ -133,6 +136,9 @@ public:
wxList m_boxes;
protected:
// implement some base class methods
virtual wxSize DoGetBestSize() const;
// common part of all ctors
void Init();

61
src/gtk/radiobox.cpp
View File

@@ -243,6 +243,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
m_parent->DoAddChild( this );
bool wasShown = IsShown();
if ( wasShown )
Hide(); // prevent PostCreation() from showing us
PostCreation();
InheritAttributes();
@@ -252,20 +255,10 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
SetFont( parent->GetFont() );
wxSize ls = LayoutItems();
SetBestSize( size );
GtkRequisition req;
req.width = 2;
req.height = 2;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
if (req.width > ls.x) ls.x = req.width;
wxSize newSize = size;
if (newSize.x == -1) newSize.x = ls.x;
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
Show( TRUE );
if ( wasShown )
Show();
return TRUE;
}
@@ -285,25 +278,34 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::DoSetSize( x, y, width, height, sizeFlags );
LayoutItems();
LayoutItems(false);
}
wxSize wxRadioBox::LayoutItems()
wxSize wxRadioBox::DoGetBestSize() const
{
int x = 7;
int y = 15;
wxSize size = LayoutItems(true);
if ( m_majorDim == 0 )
{
// avoid dividing by 0 below
wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
GtkRequisition req;
req.width = 2;
req.height = 2;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
if (req.width > size.x)
size.x = req.width;
m_majorDim = 1;
}
return size;
}
wxSize wxRadioBox::LayoutItems(bool justCalc) const
{
wxSize res( 0, 0 );
// avoid dividing by 0 below
wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
wxSize res( 0, 0 );
int x = 7;
int y = 15;
int num_of_cols = 0;
int num_of_rows = 0;
@@ -342,7 +344,8 @@ wxSize wxRadioBox::LayoutItems()
if (req.width > max_len) max_len = req.width;
gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
if ( !justCalc )
gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += req.height;
node = node->GetNext();
@@ -356,7 +359,8 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
if ( !justCalc )
gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
node = node->GetNext();
if (!node) break;
@@ -395,7 +399,8 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
if ( !justCalc )
gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
x += max;
node = node->GetNext();
@@ -417,7 +422,7 @@ bool wxRadioBox::Show( bool show )
return FALSE;
}
if ((m_windowStyle & wxNO_BORDER) != 0)
if ( HasFlag(wxNO_BORDER) )
gtk_widget_hide( m_widget );
wxList::compatibility_iterator node = m_boxes.GetFirst();

61
src/gtk1/radiobox.cpp
View File

@@ -243,6 +243,9 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
m_parent->DoAddChild( this );
bool wasShown = IsShown();
if ( wasShown )
Hide(); // prevent PostCreation() from showing us
PostCreation();
InheritAttributes();
@@ -252,20 +255,10 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
SetFont( parent->GetFont() );
wxSize ls = LayoutItems();
SetBestSize( size );
GtkRequisition req;
req.width = 2;
req.height = 2;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
if (req.width > ls.x) ls.x = req.width;
wxSize newSize = size;
if (newSize.x == -1) newSize.x = ls.x;
if (newSize.y == -1) newSize.y = ls.y;
SetSize( newSize.x, newSize.y );
Show( TRUE );
if ( wasShown )
Show();
return TRUE;
}
@@ -285,25 +278,34 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxWindow::DoSetSize( x, y, width, height, sizeFlags );
LayoutItems();
LayoutItems(false);
}
wxSize wxRadioBox::LayoutItems()
wxSize wxRadioBox::DoGetBestSize() const
{
int x = 7;
int y = 15;
wxSize size = LayoutItems(true);
if ( m_majorDim == 0 )
{
// avoid dividing by 0 below
wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
GtkRequisition req;
req.width = 2;
req.height = 2;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
if (req.width > size.x)
size.x = req.width;
m_majorDim = 1;
}
return size;
}
wxSize wxRadioBox::LayoutItems(bool justCalc) const
{
wxSize res( 0, 0 );
// avoid dividing by 0 below
wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
wxSize res( 0, 0 );
int x = 7;
int y = 15;
int num_of_cols = 0;
int num_of_rows = 0;
@@ -342,7 +344,8 @@ wxSize wxRadioBox::LayoutItems()
if (req.width > max_len) max_len = req.width;
gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
if ( !justCalc )
gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
y += req.height;
node = node->GetNext();
@@ -356,7 +359,8 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
if ( !justCalc )
gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
node = node->GetNext();
if (!node) break;
@@ -395,7 +399,8 @@ wxSize wxRadioBox::LayoutItems()
{
GtkWidget *button = GTK_WIDGET( node->GetData() );
gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
if ( !justCalc )
gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
x += max;
node = node->GetNext();
@@ -417,7 +422,7 @@ bool wxRadioBox::Show( bool show )
return FALSE;
}
if ((m_windowStyle & wxNO_BORDER) != 0)
if ( HasFlag(wxNO_BORDER) )
gtk_widget_hide( m_widget );
wxList::compatibility_iterator node = m_boxes.GetFirst();