From bbeb6c2bc2365fb93a4de48b4f51d36af91c321c Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Mon, 25 Oct 1999 16:55:15 +0000
Subject: [PATCH]   Mem leak in new accelerator code.   Install things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/gtk/changes.txt    | 13 +++++++++++--
 docs/gtk/install.txt    | 22 ++++++++++++++--------
 src/common/utilscmn.cpp |  2 +-
 src/gtk/menu.cpp        |  2 ++
 src/gtk1/menu.cpp       |  2 ++
 5 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 994e93fc20..19f119fa6e 100644
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,6 +1,11 @@
 
 25th October '99: My birthday, wxWindows 2.1.10 released
 
+There is still a unresolved problem with bitmap to image
+conversion on big-endian architectures (such as Solaris),
+where color values get exchanged. I'd need help on this
+one.
+
 Enlightment has struck the majority of the developers and
 they have chosen to use the Linux kernel numbering scheme
 for wxWindows from now on. This means that the next stable
@@ -83,9 +88,13 @@ wxSlider, wxWindow, wxScrollBar now emit the correct events
 for scrolling (like page up, line up etc) instead of just
 "thumb-track" as before.
 
-Corrected Reparent() code.
+Corrected Reparent() code, including the special case for
+wxToolBar (as the toolbar sits in a different window than
+normal windows).
 
-Corrected key accelerator code for toplevel child windows.
+Corrected key accelerator code for toplevel child windows
+and added support for more key combinations - pretty much
+all, actually.
 
 Corrected cursor handling in a number of special cases.
 
diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index ff425b0529..c151ad30b0 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -90,7 +90,7 @@ program - or due to using a broken compiler (and its optimisation) such as GCC 2
 
 Now create your super-application myfoo.app and compile anywhere with
 
-g++ myfoo.cpp `wx-config --libs --cflags` -o myfoo
+gcc myfoo.cpp `wx-config --libs --cflags` -o myfoo
 
 * General
 -----------------------
@@ -143,7 +143,7 @@ make install
 ldconfig
 exit
   
-NB: DO NOT COMPILE WXGTK WITH GCC AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
+NB: DO NOT COMPILE WXGTK WITH GCC 2.7 AND THREADS, SINCE ALL PROGRAMS WILL CRASH UPON 
 START-UP! Just always use egcs and be happy.
 
 * Building wxGTK on OS/2
@@ -239,12 +239,12 @@ toolkit. You must do this by running configure with either of:
 
 The following options handle the kind of library you want to build.
 
-	--disable-threads       Compile without thread support. Threads
-	                        support is also required for the
-				socket code to work.
+	--disable-threads       Compile without thread support.
 
 	--disable-shared        Do not create shared libraries.
 
+	--enable-static         Create static libraries.
+
 	--disable-optimise	Do not optimise the code. Can
 	                        sometimes be useful for debugging
 				and is required on some architectures
@@ -270,9 +270,9 @@ The following options handle the kind of library you want to build.
 				
 	--enable-permissive     Enable compilation without creation of
 	                        giving erros as soon as you compile with
-				Solaris ANSI-defying headers...
+				Solaris' ANSI-defying headers...
 				
-	--enable-mem_tracing    Add built-in memory tracing. 
+	--enable-mem_tracing    Add built-in memory tracing.
 				
 	--enable-dmalloc        Use the dmalloc memory debugger.
 	                        Read more at www.letters.com/dmalloc/
@@ -305,7 +305,13 @@ are
 	
 	--without-libjpeg	Disables JPEG image format code.
 	
-{	--without-odbc          Disables ODBC code. Not yet. }
+	--disable-pnm		Disables PNM image format code.
+	
+	--disable-gif		Disables GIF image format code.
+	
+	--disable-pcx		Disables PCX image format code.
+	
+	--without-odbc          Disables ODBC code.
 	
         --disable-resources     Disables the use of *.wxr type
 	                        resources.
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2491395090..a96372e00d 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -525,7 +525,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
         }
     }
 
-    return NULL;
+    return (wxAcceleratorEntry *)NULL;
 }
 
 #endif // wxUSE_ACCEL
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index de0b18636f..d0b20891bb 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -853,6 +853,8 @@ static wxString GetHotKey( const wxMenuItem& item )
                 wxFAIL_MSG( wxT("unknown keyboard accel") );
         }
     }
+    if (accel)
+        delete accel;
 
     return hotkey;
 }
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index de0b18636f..d0b20891bb 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -853,6 +853,8 @@ static wxString GetHotKey( const wxMenuItem& item )
                 wxFAIL_MSG( wxT("unknown keyboard accel") );
         }
     }
+    if (accel)
+        delete accel;
 
     return hotkey;
 }
-- 
2.45.2