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

Include wx/log.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-26 08:21:31 +00:00
parent 56b6cf265c
commit e4db172a3b
220 changed files with 1194 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/univ/toolbar.cpp
View File

@@ -27,17 +27,18 @@
#if wxUSE_TOOLBAR
#include "wx/toolbar.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
#endif
#include "wx/univ/renderer.h"
#include "wx/frame.h"
#include "wx/toolbar.h"
#include "wx/image.h"
#include "wx/log.h"
// ----------------------------------------------------------------------------
// constants
@@ -649,14 +650,14 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
PerformAction( wxACTION_BUTTON_RELEASE, numArg );
PerformAction( wxACTION_BUTTON_CLICK, numArg );
// Write by Danny Raynor to change state again.
// Write by Danny Raynor to change state again.
// Check button still pressed or not
if( tool->IsInverted() )
{
PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );
{
PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );
}
// Set mouse leave toolbar button range (If still in the range,
// toolbar button would get focus again
PerformAction( wxACTION_TOOLBAR_LEAVE, numArg );
@@ -882,4 +883,3 @@ bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
}
#endif // wxUSE_TOOLBAR