mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
1.1 KiB

  1. --- ./modules/gui/wxwidgets/open.cpp~ 2005-12-11 22:36:20.000000000 +0100
  2. +++ ./modules/gui/wxwidgets/open.cpp 2006-01-18 17:56:19.000000000 +0100
  3. @@ -1334,7 +1334,7 @@
  4. {
  5. char **ppsz_cd_drives;
  6. const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
  7. - char *psz_device = const_cast<char *>(tmp_buf.data());
  8. + char *psz_device = const_cast<char *>(tmp_buf);
  9. if( IsDVD(psz_device) )
  10. {
  11. @@ -1404,7 +1404,7 @@
  12. {
  13. char *ppsz_device[2];
  14. const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
  15. - char *psz_device = const_cast<char *>(tmp_buf.data());
  16. + char *psz_device = const_cast<char *>(tmp_buf);
  17. ppsz_device[0] = (device && *device) ? psz_device : NULL;
  18. ppsz_device[1] = NULL;
  19. return ProbeDevice(ppsz_device, CDIO_FS_AUDIO, false);
  20. @@ -1417,7 +1417,7 @@
  21. {
  22. char *ppsz_device[2];
  23. const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device);
  24. - char *psz_device = const_cast<char *>(tmp_buf.data());
  25. + char *psz_device = const_cast<char *>(tmp_buf);
  26. ppsz_device[0] = (device && *device) ? psz_device : NULL;
  27. ppsz_device[1] = NULL;
  28. return ProbeDevice(ppsz_device,