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

Implement support for wxSL_<DIR> in wxGTK, show them better in the sample.

Browse Source 
Support wxSL_{LEFT,TOP,RIGHT,BOTTOM} in wxGTL version of wxSlider.

Make the display of the orientations in the slider page of the widgets sample
more clear.

Also document wxSL_<DIR> meaning better.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-14 23:15:27 +00:00
parent eec4500dca
commit c0a9fe92fa
3 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/slider.cpp
View File

@@ -357,16 +357,30 @@ bool wxSlider::Create(wxWindow *parent,
m_minLabel = NULL;
}
if (style & wxSL_VALUE_LABEL)
const bool showValueLabel = (style & wxSL_VALUE_LABEL) != 0;
gtk_scale_set_draw_value(GTK_SCALE (m_scale), showValueLabel );
if ( showValueLabel )
{
gtk_scale_set_draw_value(GTK_SCALE (m_scale), TRUE );
// position the label appropriately: notice that wxSL_DIRECTION flags
// specify the position of the ticks, not label, under MSW and so the
// label is on the opposite side
GtkPositionType posLabel;
if ( style & wxSL_VERTICAL )
{
if ( style & wxSL_LEFT )
posLabel = GTK_POS_RIGHT;
else // if ( style & wxSL_RIGHT ) -- this is also the default
posLabel = GTK_POS_LEFT;
}
else // horizontal slider
{
if ( style & wxSL_TOP )
posLabel = GTK_POS_BOTTOM;
else // if ( style & wxSL_BOTTOM) -- this is again the default
posLabel = GTK_POS_TOP;
}
if (style & wxSL_VERTICAL)
gtk_scale_set_value_pos( GTK_SCALE(m_scale), GTK_POS_LEFT );
}
else
{
gtk_scale_set_draw_value(GTK_SCALE (m_scale), FALSE );
gtk_scale_set_value_pos( GTK_SCALE(m_scale), posLabel );
}
// Keep full precision in position value