From: Julian Smart Date: Mon, 8 Apr 2002 20:17:40 +0000 (+0000) Subject: Added define to STC VC++ project file X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4e4dc03dcce4f881bcf8ca3586128ddf40ba0eea Added define to STC VC++ project file Ming/Cygwin makeprog.env clean target now cleans .exes Edited version in install.txt Copied HTML files from web files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/src/stc/scintilla/src/KeyWords.cxx b/contrib/src/stc/scintilla/src/KeyWords.cxx index 804846e19e..d1eddef5ff 100644 --- a/contrib/src/stc/scintilla/src/KeyWords.cxx +++ b/contrib/src/stc/scintilla/src/KeyWords.cxx @@ -97,7 +97,7 @@ static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[ LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); -#if 1 // def __vms +#ifdef __vms #define LINK_LEXERS #endif diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index f53687cfaa..426ae7aac3 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -242,7 +242,8 @@ samples/caret/*.xpm samples/caret/*.xbm samples/caret/*.png samples/caret/*.ico -samples/caret/*.txtsamples/caret/*.pro +samples/caret/*.txt +samples/caret/*.pro samples/checklst/*.cpp samples/checklst/*.h diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt index 20ebcd830a..c7dd8c3b7b 100644 --- a/distrib/msw/innobott.txt +++ b/distrib/msw/innobott.txt @@ -2,7 +2,6 @@ [Icons] Name: {group}\Dialog Editor; Filename: {app}\bin\dialoged.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\dialoged.exe; IconIndex: 0 Name: {group}\Dialog Editor Help; Filename: {app}\bin\dialoged.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths - Name: {group}\Life! Demo; Filename: {app}\bin\life.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\life.exe; IconIndex: 0 Name: {group}\Tex2rtf; Filename: {app}\bin\tex2rtf.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\tex2rtf.exe; IconIndex: 0 Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.hlp; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths @@ -12,6 +11,8 @@ Name: {group}\wxWindows Help; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths Name: {group}\HTML Docs Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths +; Name: {group}\Life! Demo; Filename: {app}\bin\life.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\life.exe; IconIndex: 0 + [INI] [Registry] diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 9c0b683abc..34e717db32 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -22,6 +22,9 @@ src/regex/regex.dsw samples/samples.dsw +samples/artprov/arttest.dsp +samples/artprov/arttest.dsw + samples/calendar/arttest.dsp samples/calendar/arttest.dsw diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index 88f3821fe9..4ef9c72e5f 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -183,7 +183,7 @@ if not isdir bin mkdir bin copy %src%\bin\dialoged.exe bin copy %src%\bin\tex2rtf.exe bin copy %src%\bin\dbgview.* bin -copy %src%\bin\life.exe bin +Rem copy %src%\bin\life.exe bin copy %src%\docs\winhelp\dialoged.hlp %src%\docs\winhelp\dialoged.cnt bin copy %src%\docs\winhelp\tex2rtf.hlp %src%\docs\winhelp\tex2rtf.cnt bin diff --git a/docs/html/faq.htm b/docs/html/faq.htm index 8dca0fa260..dc7bbb8f35 100644 --- a/docs/html/faq.htm +++ b/docs/html/faq.htm @@ -5,15 +5,15 @@ wxWindows 2 FAQ - + - +
- @@ -25,9 +25,10 @@ Welcome to the wxWindows FAQ. Please select a category:

diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm index 0c14ce0fe1..d7fad5bc19 100644 --- a/docs/html/faqgen.htm +++ b/docs/html/faqgen.htm @@ -5,15 +5,15 @@ wxWindows 2 FAQ: General - + -
- -wxWindows 2 FAQ + + +wxWindows 2 FAQ
+
- diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm index bd6386cbe2..e89b148d98 100644 --- a/docs/html/faqgtk.htm +++ b/docs/html/faqgtk.htm @@ -1,18 +1,19 @@ + wxWindows 2 for GTK FAQ - + -
- -wxWindows 2 FAQ: General + + +wxWindows 2 FAQ: General
+
- diff --git a/docs/html/faqmac.htm b/docs/html/faqmac.htm index 1357289d66..61fa399ff6 100644 --- a/docs/html/faqmac.htm +++ b/docs/html/faqmac.htm @@ -1,18 +1,19 @@ + wxWindows 2 for Mac FAQ - + -
- -wxWindows 2 for GTK FAQ + + +wxWindows 2 for GTK FAQ
+
- @@ -46,8 +47,8 @@ The author of this port is Stefan Cs
- -wxWindows 2 for Mac FAQ + + +wxWindows 2 for Mac FAQ
-
- + + Please note that the version of wxMac in CVS is more robust and nearly feature-complete compared with the packaged 2.0 release. Until a new release is made, it is recommended that you download the wxMac 2.3.1 development snapshot or the sources from the CVS trunk. diff --git a/docs/html/faqmot.htm b/docs/html/faqmot.htm index 6f907f0bfc..8920cbe82d 100644 --- a/docs/html/faqmot.htm +++ b/docs/html/faqmot.htm @@ -1,18 +1,19 @@ + wxWindows 2 for Motif FAQ - + - +
- diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm index 58dca23c94..30970bb620 100644 --- a/docs/html/faqmsw.htm +++ b/docs/html/faqmsw.htm @@ -1,18 +1,19 @@ + wxWindows 2 for Windows FAQ - + -
- -wxWindows 2 for Motif FAQ + + +wxWindows 2 for Motif FAQ
+
- @@ -26,9 +27,11 @@ See also top-level FAQ page.

Which Windows platforms are supported?

wxWindows 2 can be used to develop and deliver applications on Windows 3.1, Win32s, -Windows 95, Windows 98, and Windows NT. A Windows CE version is being looked into (see below).

+Windows 95, Windows 98, Windows NT, Windows 2000, and Windows XP. A Windows CE +version is being looked into (see below).

wxWindows 2 is designed to make use of WIN32 features and controls. However, unlike Microsoft, we have not forgotten users of 16-bit Windows. Most features @@ -76,6 +81,37 @@ and there. Since wxWindows for 2 produces small binaries (less than 300K for the statically-linked 'minimal' sample), shoehorning wxWindows 2 into a Windows CE device's limited storage should not be a problem.

+

What do I need to do for Windows XP?

+ +In the same directory as you have your executable (e.g. foo.exe) you +put a file called foo.exe.manifest in which you have something like +the following: + +
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+   xmlns="urn:schemas-microsoft-com:asm.v1"
+   manifestVersion="1.0">
+<assemblyIdentity
+    processorArchitecture="x86"
+    version="5.1.0.0"
+    type="win32"
+    name="foo.exe"/>
+    <description>Foo program</description>
+    <dependency>
+    <dependentAssembly>
+    <assemblyIdentity
+         type="win32"
+         name="Microsoft.Windows.Common-Controls"
+         version="6.0.0.0"
+         publicKeyToken="6595b64144ccf1df"
+         language="*"
+         processorArchitecture="x86"/>
+    </dependentAssembly>
+    </dependency>
+</assembly>
+
+

What compilers are supported?

Please see the wxWindows 2 for Windows install.txt file for up-to-date information, but @@ -126,6 +162,22 @@ wxWindows. Yes, Unicode is fully supported under Windows NT/2000 (Windows 9x don't have Unicode support anyhow). +

Does wxWindows support double byte fonts (Chinese/Japanese/Korean etc.)?

+ +An answer from Klaus Goedde:

+ +"For Japanese under Win2000, it seems that wxWindows has no problems to work with double byte char sets +(I mean DBCS, that's not Unicode). First you have to install Japanese support on your Win2K system +and choose for ANSI translation +HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Nls\CodePage=932 (default is 1252 for Western). +Then you can see all the funny Japanese letters under wxWindows too.

+ +In a wxTextCtrl control you have to set the window style "wxTE_RICH", otherwise this control shows the wrong +letters. + +I don't now whether it works on non W2K systems, because I'm just starting using wxWindows." +

+

Can you compile wxWindows 2 as a DLL?

Yes (using the Visual C++ or Borland C++ makefile), but be aware that distributing DLLs is a thorny issue @@ -152,10 +204,11 @@ indirectly) referenced by your application. So for example, the 'minimal' sample is less than 300KB using VC++ 6.

If you want to distribute really small executables, you can -use Petite +use Petite by Ian Luck. This nifty utility compresses Windows executables by around 50%, so your 500KB executable will shrink to a mere 250KB. With this sort of size, there is reduced incentive to -use DLLs.

+use DLLs. Another good compression tool is UPX. +

Is wxWindows compatible with MFC?

@@ -322,6 +375,63 @@ This can happen if you have a child window intercepting EVT_CHAR events and swal all keyboard input. You should ensure that event.Skip() is called for all input that isn'used by the event handler. +

Why can I not write to the HKLM part of the registry with wxRegConfig?

+ +Currently this is not possible because the wxConfig family of classes is +supposed to deal with per-user application configuration data, and HKLM is +only supposed to be writeable by a user with Administrator privileges. In theory, +only installers should write to HKLM. This is still a point debated by the +wxWindows developers. There are at least two ways to work around it if you really +need to write to HKLM.

+ +First, you can use wxRegKey directly, for example: + +

+    wxRegKey regKey;
+
+    wxString idName(wxT("HKEY_LOCAL_MACHINE\\SOFTWARE\\My Company\\My Product\\Stuff\\"));
+    idName += packid;
+
+    regKey.SetName(idName);
+
+    {
+        wxLogNull dummy; 
+        if (!regKey.Create())
+        {
+            idName = wxT("HKEY_CURRENT_USER\\SOFTWARE\\My Company\\My Product\\Stuff\\");
+            idName += packid;
+            regKey.SetName(idName);
+            if (!regKey.Create())
+                return FALSE;
+        }
+    }
+
+    if (!regKey.SetValue(wxT("THING"), (long) thing)) err += 1;
+
+    regKey.Close();
+
+
+ +Or, you can employ this trick suggested by Istvan Kovacs: + +
+class myGlobalConfig : public wxConfig
+{
+    myGlobalConfig() :
+        wxConfig ("myApp", "myCompany", "", "", wxCONFIG_USE_GLOBAL_FILE)
+{};
+    bool Write(const wxString& key, const wxString& value);
+}
+
+bool myGlobalConfig::Write (const wxString& key, const wxString& value)
+{
+    wxString path = wxString ("SOFTWARE\\myCompany\\myApp\\") + wxPathOnly(key);
+    wxString new_path = path.Replace ("/", "\\", true);
+    wxString new_key = wxFileNameFromPath (key);
+    LocalKey().SetName (wxRegKey::HKLM, path);
+    return wxConfig::Write (new_key, value);
+}
+
 diff --git a/docs/html/platform.htm b/docs/html/platform.htm index 3fce58d0d9..2bab78399c 100644 --- a/docs/html/platform.htm +++ b/docs/html/platform.htm @@ -5,15 +5,15 @@ - + - +
- -wxWindows 2 for Windows FAQ + + +wxWindows 2 for Windows FAQ
- @@ -26,7 +26,15 @@ only). The cross icon in the third column doesn't mean that the platform is been tested on it recently (the table is being updated for wxWindows 2.1.14 beta currently).

-See also the daily rebuilds page for some of the platforms mentioned below. +See also: + +

+

If you have tested wxWindows on a platform not mentioned here, please tell us about your experience on our mailing list! We would especially like to have information about compiling wxGTK on other Unix variants, such as IRIX, DG-UX, @@ -38,7 +46,7 @@ often don't work.

- -Supported Platforms + + +Supported Platforms
- + @@ -94,8 +102,9 @@ often don't work. - + + @@ -103,8 +112,7 @@ often don't work. - + diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 7533beb565..edca741285 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -1,12 +1,12 @@ -Installing wxWindows 2.3 ------------------------- +Installing wxWindows 2.3.3 +-------------------------- -This is wxWindows 2.3 for Microsoft Windows 9x/ME, Windows NT, +This is wxWindows 2.3.3 for Microsoft Windows 9x/ME, Windows NT, Windows 2000 and Windows XP. This is an unstable development release. Please note that the library naming conventions for VC++ -compilation have changed between 2.3.1 and 2.3.2. This means that +compilation have changed after 2.3.1. This means that you will need to change your application project files. See the relevant section below for details. diff --git a/src/makeprog.g95 b/src/makeprog.g95 index 2200451b60..98287d1450 100644 --- a/src/makeprog.g95 +++ b/src/makeprog.g95 @@ -25,6 +25,7 @@ clean: -$(RM) core -$(RM) *.rsc -$(RM) *.res + -$(RM) *.exe cleanall: clean -$(RM) $(TARGET).exe diff --git a/src/stc/scintilla/src/KeyWords.cxx b/src/stc/scintilla/src/KeyWords.cxx index 804846e19e..d1eddef5ff 100644 --- a/src/stc/scintilla/src/KeyWords.cxx +++ b/src/stc/scintilla/src/KeyWords.cxx @@ -97,7 +97,7 @@ static void ColouriseNullDoc(unsigned int startPos, int length, int, WordList *[ LexerModule lmNull(SCLEX_NULL, ColouriseNullDoc, "null"); -#if 1 // def __vms +#ifdef __vms #define LINK_LEXERS #endif
wxWindows 2 Platforms wxWindows 2 Platforms
AIXAIX wxGTK with AIX CCUnknown

wxGTK 2.2.9 with gcc 3.0.4OkIan BrownShared library building doesn't work, use --disable-shared
wxMotif with xlC 3.1.4.0 (AIX 4.2)Ok Bernhard Eck Some problems with OpenGL and native X server
HP-UX 10.20wxGTK with HP CC A.10.22
or HP aCC B3910B A.01.18 - 		OkStaf VerhaegenwxGTK with HP CC A.10.22
or HP aCC B3910B A.01.18		OkStaf Verhaegen you need to add -Aa -D_HPUX_SOURCE to CFLAGS
wxGTK with gccOkJulian Albo Garcia