Commit Graph

20 Commits

Author SHA1 Message Date
Julian Smart
821a27d77d Applied part of patch [ 652965 ] Enables toolbar simple in wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-16 10:50:49 +00:00
Julian Smart
4849c8132b Fixed [ 548055 ] Bug in wxToolBarSimple::Realize()
Cédric RICARD

There is an inversion in wxToolBarSimple::Realize():

The current code is :
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
m_maxWidth += maxToolWidth;
else
m_maxHeight += maxToolHeight;

I think it should be :
if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
m_maxHeight += maxToolHeight;
else
m_maxWidth += maxToolWidth;


Just take an example to see the bug, and have a look
to the rest of the function :

If you create an horizontal tool bar with only 3
tools of 16 pixels length each, when you reach this
code, m_maxWidth is equal to 3*16 pixels. So it have
the good width. You needn't to add other 16 pixels.
But m_maxHeight is equal to 0 ! So you have to take
care of the line you have just created...

This is very logical. In an horizontal tool bar,
m_maxWidth is increased after each new tool. But
m_maxHeight is only increased when an entire line is
finished, or when the last tool is added to take care
of the last line.

And at last, I think you should add a :

SetSize(m_maxWidth, m_maxHeight);

after the previous code. Just try the ToolBar sample
code. It only works if I do that...




git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-20 08:21:00 +00:00
Julian Smart
a977709b11 Canvas: added some DECLARE_CLASS macros to stop it failing
in class info initialisation
Mmedia: compiles agin
Plot: corrected VC++ project settings
Simple toolbar: should draw a highlight again now
Generic dir control: moved control ids to header for apps that
need to get hold of the individual controls
Scintilla: unconditionally compile Scintilla_LinkLexers() to correct
link error in sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-08 10:50:14 +00:00
Vadim Zeitlin
e76c0b5fc5 implemented (but it doesn't work yet) the radio buttons and text in the buttons for the GTK toolbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-25 21:38:18 +00:00
Vadim Zeitlin
bfe9b3dac0 compilation fix for WXWIN_COMPATIBILITY_2_2 == 0 case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-05 16:38:08 +00:00
Robert Roebling
c08a4f0068 Added simplistic wxToolBar to wxUniversal. It
still corrupts the non-client area.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-24 19:49:36 +00:00
Vadim Zeitlin
7516ed26c9 1. wxSystemSettings class API face lift: better names for its methods
2. wxSystemSettings under wxUniv uses the wxTheme and wxColourScheme


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-12-30 22:34:36 +00:00
Václav Slavík
a6b27b78d3 fix for palette restoration in wxToolBarSimple
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-24 23:59:08 +00:00
Mattia Barbon
9e0a12c958 Changed char* to wxChar* in wxColour constructor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-16 19:05:56 +00:00
Vadim Zeitlin
80806624f8 fixes for compilation with wxUSE_PALETTE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-04 01:50:17 +00:00
Vadim Zeitlin
7aa5864467 make it possible to use wxToolBarSimple as wxToolBar with wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:21:47 +00:00
Julian Smart
e143729845 Fixed Simple Toolbar bug; removed 2 pixel kludge in splash screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 20:34:19 +00:00
Robert Roebling
0f442030c4 Prepare wxToolBarSimple for event type change.
Make wxGrid use new event types.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:27:01 +00:00
Julian Smart
12ed316d02 Added DECLARE/IMLEMENT_CLASS for wxToolBarBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-10-06 16:52:29 +00:00
Julian Smart
f42c2a7a62 wxToolBarSimple fix + OGL studio sample compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-24 16:26:20 +00:00
Vadim Zeitlin
674ac8b919 1. more warnings fixes in gtk/region.cpp and common/tbarsmpl.cpp
2. wxWindow::Create() always takes a wxValidator parameter, even if
   !wxUSE_VALIDATORS - it is just ignored then, tons of #if wxUSE_VALIDATORS
   removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-06 16:47:48 +00:00
Vadim Zeitlin
6f2a55e34a 1. more HP-UX warning fixes (almost done...)
2. added a macro WXUNUSED_UNLESS_DEBUG()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-06 15:42:32 +00:00
Vadim Zeitlin
479cd5de40 more fixes to compilation warnings from HP-UX build log. About 30% more to go
<sigh>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-05 15:35:04 +00:00
Vadim Zeitlin
406005d21b more unused param warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-26 21:54:12 +00:00
Vadim Zeitlin
8a0681f933 merging in the toolbar changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-15 19:47:54 +00:00