| + +Creating and converting icons + + | +
+ +Icons are bitmaps that may contain transparency information. Under X, icons are +usually created from XPM files, which may be loaded from a file or created from +data embedded in a C++ source file.
+ +Under Windows, icon files (extension .ico) may contain multiple icons for different sizes and colour +depths, and can be loaded from a file or loaded from the Windows resources compiled +into the executable.
+ +You can decide to use only XPMs on Windows and Unix, or you could use XPMs on Unix and +Windows icons under Windows -- the latter will require some #idefs in your code or use of the wxICON macro.
+ +If you are using a compiler such as Borland C++, Visual C++ or Watcom C++, you +can use the provided icon editor. However, if using Cygwin or Mingw32, there +is no icon editor so you must obtain one separately, such as IconEdit32.
+ +To convert from XPM to BMP (which can be loaded or pasted into an icon editor to save as an ICO file), +you can use Vadim Zeitlin's xpm2bmp.exe utility. +To convert from BMP to XPM, you can use xpmshow.exe +(sometimes renamed bmp2xpm.exe) which is actually am old wxWindows 1.68 utility. You will have to edit the resulting +file since the full path is used as the variable name, plus you may wish to specify a transparent colour e.g.:
+ +
+" s None c None", ++ +This will indicate that the space character will be taken as the transparent colour throughout the image.
+ + + +
+ + + diff --git a/samples/mfc/mfctest.cpp b/samples/mfc/mfctest.cpp index ab1e42de2e..d50d963470 100644 --- a/samples/mfc/mfctest.cpp +++ b/samples/mfc/mfctest.cpp @@ -46,6 +46,9 @@ // version. Perhaps someone else is a wizard at working out the required settings // in the wxWin library and the sample; then debugging the assert problem may be // easier. +// +// (4) Compiling wxWindows in DLL mode currently includes windows.h, so you must only +// try linking wxWindows statically. // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -56,8 +59,8 @@ #include "wx/wx.h" -#ifdef _WINDOWS_ -#error Sorry, you need to edit include/wx/wxprec.h, comment out the windows.h inclusion, and recompile. +#if defined(_WINDOWS_) || !wxUSE_MFC +#error Sorry, you need to edit include/wx/msw/setup.h, set wxUSE_MFC to 1, and recompile. #endif #ifdef new diff --git a/src/common/config.cpp b/src/common/config.cpp index 44171b597e..feccd99ab0 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -42,6 +42,7 @@ #include