added wxSafeConvertMB2WX/WX2MB() and use them when interfacing with C functions which...

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index ed899e5ceedde80877a3a9a574fe836592a20cc5..2c9bb645f18c474c142dba282faf354428bd082c 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -26,19 +26,12 @@
     #include "wx/font.h"
 #endif
 
-#include "wx/file.h"
-#include "wx/filename.h"
 #include "wx/thread.h"
 
 #ifdef __WXGPE__
     #include <gpe/init.h>
 #endif
 
-#ifdef __WXUNIVERSAL__
-    #include "wx/univ/theme.h"
-    #include "wx/univ/renderer.h"
-#endif
-
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
@@ -48,9 +41,9 @@
 // link GnomeVFS
 //-----------------------------------------------------------------------------
 
-#if wxUSE_LIBGNOMEVFS
-#include "wx/html/forcelnk.h"
-FORCE_LINK(gnome_vfs)
+#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS
+    #include "wx/link.h"
+    wxFORCE_LINK_MODULE(gnome_vfs)
 #endif
 
 //-----------------------------------------------------------------------------
@@ -216,7 +209,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
         // Release lock again
         gdk_threads_leave();
-        
+
         {
             // If another idle source was added, remove it
 #if wxUSE_THREADS
@@ -485,7 +478,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
             {
-                memmove(argv + i, argv + i + 1, argc - i);
+                memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
             }
         }