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

fixed warnings about pointer to integer cast

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 23:36:10 +00:00
parent 3e8adad7d7
commit 9f542367b7
4 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/containr.cpp
View File

@@ -40,6 +40,9 @@
#include "wx/radiobut.h"
#endif
// trace mask for focus messages
#define TRACE_FOCUS _T("focus")
// ============================================================================
// implementation
// ============================================================================
@@ -129,13 +132,13 @@ void wxControlContainer::SetLastFocus(wxWindow *win)
if ( win )
{
wxLogTrace(_T("focus"), _T("Set last focus to %s(%s)"),
wxLogTrace(TRACE_FOCUS, _T("Set last focus to %s(%s)"),
win->GetClassInfo()->GetClassName(),
win->GetLabel().c_str());
}
else
{
wxLogTrace(_T("focus"), _T("No more last focus"));
wxLogTrace(TRACE_FOCUS, _T("No more last focus"));
}
}
@@ -496,8 +499,8 @@ void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
bool wxControlContainer::DoSetFocus()
{
wxLogTrace(_T("focus"), _T("SetFocus on wxPanel 0x%08lx."),
(unsigned long)m_winParent->GetHandle());
wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."),
m_winParent->GetHandle());
if (m_inSetFocus)
return true;
@@ -537,8 +540,8 @@ bool wxControlContainer::DoSetFocus()
void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
{
wxLogTrace(_T("focus"), _T("OnFocus on wxPanel 0x%08lx, name: %s"),
(unsigned long)m_winParent->GetHandle(),
wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"),
m_winParent->GetHandle(),
m_winParent->GetName().c_str() );
DoSetFocus();
@@ -567,9 +570,9 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
// It might happen that the window got reparented
if ( (*childLastFocused)->GetParent() == win )
{
wxLogTrace(_T("focus"),
_T("SetFocusToChild() => last child (0x%08lx)."),
(unsigned long)(*childLastFocused)->GetHandle());
wxLogTrace(TRACE_FOCUS,
_T("SetFocusToChild() => last child (0x%p)."),
(*childLastFocused)->GetHandle());
// not SetFocusFromKbd(): we're restoring focus back to the old
// window and not setting it as the result of a kbd action
@@ -603,9 +606,9 @@ bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
}
#endif
wxLogTrace(_T("focus"),
_T("SetFocusToChild() => first child (0x%08lx)."),
(unsigned long)child->GetHandle());
wxLogTrace(TRACE_FOCUS,
_T("SetFocusToChild() => first child (0x%p)."),
child->GetHandle());
*childLastFocused = child;
child->SetFocusFromKbd();