patches/wxwidgets-04-wxFileName-ticket-4697.diff
author markwright
Sun, 06 Jun 2010 10:37:12 +0000
changeset 2760 6102b8653c96
permissions -rw-r--r--
2010-06-06 Mark Wright <[email protected]> * SFEerlang.spec, base-specs/erlang.spec: *NEW* current Erlang programming language release, SMP, HiPE, 64bit built on Solaris 10u8 with gtk2 from KDE4 Solaris * patches/erlang-01-lib-wx-c_src-wxe_gl.h.diff: Fix for 64 bit * base-specs/wxwidgets-gnu.spec: Build 64 bit * patches/wxwidgets-05-setup.h.in.diff: Fix header for 64 bit build * patches/wxwidgets-03-changeset_r61009.diff: gtk2 GSocket name clash * patches/wxwidgets-04-wxFileName-ticket-4697.diff: Fix for 64 bit
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2760
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     1
--- wxWidgets-2.8.10-orig/include/wx/filename.h	2009-03-06 12:10:52.000000000 +0000
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     2
+++ wxWidgets-2.8.10/include/wx/filename.h	2010-06-06 00:40:18.676144021 +0000
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     3
@@ -390,7 +390,7 @@
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     4
 
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     5
     // get the canonical path separator for this format
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     6
     static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     7
-        { return GetPathSeparators(format)[0u]; }
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     8
+        { return GetPathSeparators(format)[static_cast<size_t>(0)]; }
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
     9
 
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
    10
     // is the char a path separator for this format?
6102b8653c96 2010-06-06 Mark Wright <[email protected]>
markwright
parents:
diff changeset
    11
     static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE);