fixed warnings about pointer to integer cast

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/containr.cpp b/src/common/containr.cpp
index e92abb9cbd36a2a90a044d17d4d5ac088daf31bd..72f8634104024cfce90d4cf9a1674ee2e5b91a76 100644 (file)
--- a/src/common/containr.cpp
+++ b/src/common/containr.cpp
@@ -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();

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 9096fef28fd85e2c5a307e916c736d0d10834709..00435882e3b1160156f881cb5fc6e1010e3ce162 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -354,7 +354,7 @@ void wxFileData::MakeItem( wxListItem &item )
         if ( dg.Ok() )
             item.SetTextColour(dg);
     }
-    item.m_data = (long)this;
+    item.m_data = wxPtrToUInt(this);
 }
 
 //-----------------------------------------------------------------------------
@@ -639,7 +639,7 @@ void wxFileCtrl::MakeDir()
     if (id != -1)
     {
         SortItems(m_sort_field, m_sort_foward);
-        id = FindItem( 0, (long)fd );
+        id = FindItem( 0, wxPtrToUInt(fd) );
         EnsureVisible( id );
         EditLabel( id );
     }

diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp
index 75a0c0962e8afec715c52c7837f0f46ae6874309..1157eef82da455142c6aed2edc485108b2d084fc 100644 (file)
--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -506,7 +506,12 @@ GdkAtom wxDropTarget::GetMatchingPair()
     GList *child = m_dragContext->targets;
     while (child)
     {
-        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer
+        GdkAtom formatAtom = (GdkAtom)
+#ifndef __WXGTK20__
+                             GPOINTER_TO_INT
+#endif
+                             (child->data);
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__

diff --git a/src/gtk1/dnd.cpp b/src/gtk1/dnd.cpp
index 75a0c0962e8afec715c52c7837f0f46ae6874309..1157eef82da455142c6aed2edc485108b2d084fc 100644 (file)
--- a/src/gtk1/dnd.cpp
+++ b/src/gtk1/dnd.cpp
@@ -506,7 +506,12 @@ GdkAtom wxDropTarget::GetMatchingPair()
     GList *child = m_dragContext->targets;
     while (child)
     {
-        GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
+        // in GTK+ 1.x GdkAtom was a gulong, but now it's a pointer
+        GdkAtom formatAtom = (GdkAtom)
+#ifndef __WXGTK20__
+                             GPOINTER_TO_INT
+#endif
+                             (child->data);
         wxDataFormat format( formatAtom );
 
 #ifdef __WXDEBUG__