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.

31 lines
1.0 KiB

  1. --- ./src/Config.h.orig 2005-02-25 20:01:13.323362352 +0100
  2. +++ ./src/Config.h 2005-02-25 20:05:58.288041136 +0100
  3. @@ -67,7 +67,7 @@
  4. #define CONFIG_PROP_T(name, cfgName, defName, cfgType)\
  5. cfgType Get##name(bool def = false)\
  6. - { return def ? defName : cfg->Read(cfgName, defName); }\
  7. + { return def ? defName : cfg->Read(cfgName, (cfgType&)defName); }\
  8. void Set##name(cfgType value)\
  9. {\
  10. wxLogNull log;\
  11. --- ./wxVillaLib/imagjpg.cpp.orig 2005-02-25 19:45:01.000000000 +0100
  12. +++ ./wxVillaLib/imagjpg.cpp 2005-02-25 20:08:56.000024808 +0100
  13. @@ -115,7 +115,7 @@
  14. #define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */
  15. -#if !wxCHECK_VERSION(2,5,0)
  16. +// #if !wxCHECK_VERSION(2,5,0)
  17. #define wx_init_source my_init_sources
  18. #define wx_fill_input_buffer my_fill_input_buffer
  19. #define wx_skip_input_data my_skip_input_data
  20. @@ -124,7 +124,7 @@
  21. #define wx_init_destination init_destination
  22. #define wx_empty_output_buffer empty_output_buffer
  23. #define wx_term_destination term_destination
  24. -#endif
  25. +// #endif
  26. #ifdef JPEG_METHOD_LINKAGE