build fixes

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index d94583a94576a2f684c2f4877d135e5dfb03d373..958849901f826732bf902f5a367673984ed3cf95 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -78,7 +78,7 @@ public:
     operator const void* () const      { return m_id; }
 
 #ifdef __WXDEBUG__
-    void Print( const wxString &text ) const  { wxPrintf( "item %s: %d\n", text, (int) m_id ); }
+    void Print( const wxString &text ) const;
 #endif
 
 private:

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 9fa5635c2006aa05fb382ab3851a6739c0d50886..65c893265326812994d636e332ad2daa5f424102 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -20,12 +20,13 @@
 #include "wx/dataview.h"
 
 #include "wx/spinctrl.h"
-#include "wx/dc.h"
-#include "wx/settings.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/icon.h"
+    #include "wx/crt.h"
 #endif
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
@@ -36,6 +37,12 @@ bool operator == (const wxDataViewItem &left, const wxDataViewItem &right)
     return (left.GetID() == right.GetID() );
 }
 
+#ifdef __WXDEBUG__
+void wxDataViewItem::Print(const wxString& text) const
+{
+    wxPrintf("item %s: %l\n", text, (long)m_id);
+}
+#endif
 
 // ---------------------------------------------------------
 // wxDataViewModelNotifier

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 157038541fa87153eeda079d5333f13262a6f399..f7d910d2de85e73b2d241f9816432236c05a370f 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -20,25 +20,18 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/sizer.h"
+    #include "wx/icon.h"
+    #include "wx/list.h"
+    #include "wx/settings.h"
+    #include "wx/crt.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
-#include "wx/icon.h"
-#include "wx/list.h"
 #include "wx/listimpl.cpp"
-#include "wx/settings.h"
 
 #include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
-
-#include <gobject/gvaluecollector.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreednd.h>
-
-#include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------