corresponding source files, instead of in the top level directory for each sub-project. This allows us to have source code files with the same name in different directories.
Conflicts: docs/en_US/licence.html pgadmin/dlg/dlgForeignDataWrapper.cpp pgadmin/dlg/dlgForeignServer.cpp pgadmin/dlg/dlgUserMapping.cpp pgadmin/include/dlg/dlgForeignDataWrapper.h pgadmin/include/dlg/dlgForeignServer.h pgadmin/include/dlg/dlgUserMapping.h pgadmin/include/ogl/module.mk pgadmin/include/schema/pgForeignDataWrapper.h pgadmin/include/schema/pgForeignServer.h pgadmin/include/schema/pgUserMapping.h pgadmin/ogl/module.mk pgadmin/pgAdmin3.vcproj pgadmin/schema/pgForeignDataWrapper.cpp pgadmin/schema/pgForeignServer.cpp pgadmin/schema/pgUserMapping.cpp
and diagnosed by Guillaume.
us. Largely, to get Magnus off my back :-p.
two major advantages: 1) XPM images aren't supported by many graphics tools, and almost always require manual editing to fix the internal naming anyway. 2) XPM images don't support alpha transparency. The patch is a little complex, as it's not straightforward to embed PNG images at build time. Here's what it does: - Adds a new project, png2c, on which the pgAdmin project is dependent. - Adds a new build rule for .png files, which will cause them to be pre-processed with png2c, to create .pngc files which are C source code, containing the PNG data and some accessor functions and macros. - #include's the .pngc files in place of the XPMs. - Updates the rest of the code to use the new accessor macros created in the .pngc files: filename_png_img - represents a wxImage* filename_png_bmp - represents a wxBitmap* filename_png_ico - represents a wxIcon* Each of the accessors uses static data, so in theory, this also gives us a performance optimisation as any given image only need be converted to a different format (by using the appropriate accessor) once, upon first access.
we're here, update the installer, and the wxWidgets build script.
Mega-run of the new "make style" command, to enforce coding style. This is likely to cause conflicts with most pending patches, but there shouldn't be many - and they should be easy to resolve. From now on, it's recommended to run "make style" before a commit if you do development on Unix, to keep the style up. We'll also make a regular run before releases to cover things not handled during development.
different drive than wxWidgets.
…o maintain older versions of pgAdmin. Build wxrc and hhp2cached at the same time, and update scripts to call them directly from the wxWidgets directory.
…n-debug is last and therefore becomes the default. Also, build wxrc and hhp2cached while we're at it.