Added another log.h; removed redundant trace args

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

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index 13db530ddb9e79476de7535b64d37812e1a1d76e..0021d3f2f85ceec40d778795560627cd021e523f 100644 (file)
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -38,6 +38,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/image.h"

+#include "wx/log.h"

 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index fdfe4c3a42476139ac662e5f4dd20ef6ed8d2c61..90daa58df0c2f04d597b343b70fd37565717349a 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -568,9 +568,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             printf( "GraphicExpose event\n" );
 
         {
             printf( "GraphicExpose event\n" );
 

-            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str(),
-                                          event->xgraphicsexpose.x, event->xgraphicsexpose.y,
-                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+            wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());

 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);
 
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index a55eeb94b635156eff5b0e119c86ecd332b1e8e5..ad5607f4d2e0c72d6cd4261d45ce75100c078f5a 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -1268,7 +1268,7 @@ bool wxAddWindowToTable(Window w, wxWindow *win)
     wxWidgetHashTable->Put((long) w, win);
 
     wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
     wxWidgetHashTable->Put((long) w, win);
 
     wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",

-               w, win, win->GetClassInfo()->GetClassName());
+               (unsigned int) w, win, win->GetClassInfo()->GetClassName());

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1300,7 +1300,7 @@ bool wxAddClientWindowToTable(Window w, wxWindow *win)
     wxClientWidgetHashTable->Put((long) w, win);
 
     wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
     wxClientWidgetHashTable->Put((long) w, win);
 
     wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",

-               w, win, win->GetClassInfo()->GetClassName());
+               (unsigned int) w, win, win->GetClassInfo()->GetClassName());

 
     return TRUE;
 }
 
     return TRUE;
 }