Don't set even try to set focus to wxPopupWindow itself in wxMSW.

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

diff --git a/src/gtk/filehistory.cpp b/src/gtk/filehistory.cpp
index c85267fa7839f5ebbd0a294e00815023df8c3963..7c1075ff81c28392f7b61d5b465c4e1a84b756fb 100644 (file)
--- a/src/gtk/filehistory.cpp
+++ b/src/gtk/filehistory.cpp
@@ -3,7 +3,6 @@
 // Purpose:     GTK+ bits for wxFileHistory class
 // Author:      Vaclav Slavik
 // Created:     2010-05-06
-// RCS-ID:      $Id$
 // Copyright:   (c) 2010 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,6 +31,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include "wx/gtk/private/string.h"
+#include "wx/gtk/private.h"
 
 // ============================================================================
 // implementation
@@ -43,9 +43,11 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
 #ifdef __WXGTK210__
     const wxString fullPath = wxFileName(file).GetFullPath();
+#ifndef __WXGTK3__
     if ( !gtk_check_version(2,10,0) )
+#endif
     {
-        wxGtkString uri(g_filename_to_uri(fullPath.fn_str(), NULL, NULL));
+        wxGtkString uri(g_filename_to_uri(wxGTK_CONV_FN(fullPath), NULL, NULL));
 
         if ( uri )
             gtk_recent_manager_add_item(gtk_recent_manager_get_default(), uri);