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

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 994e93fc20259abc2ec3e44d13f4950ba610c16c..19f119fa6e93dcc14d691bba1d33f8d43541e5ad 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,6 +1,11 @@
 
 25th October '99: My birthday, wxWindows 2.1.10 released
 
 
 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
 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.
 
 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.
 
 
 Corrected cursor handling in a number of special cases.
 

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index ff425b052967de5826f1ec82d595b81980a84633..c151ad30b099728c9ca2bb18123e03abdcb179b5 100644 (file)
--- 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
 
 
 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
 -----------------------
 
 * General
 -----------------------


@@ -143,7 +143,7 @@ make install
 ldconfig
 exit
   
 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
 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.
 
 
 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.
 
 
        --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
        --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
                                
        --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/
                                
        --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-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.
        
         --disable-resources     Disables the use of *.wxr type
                                resources.

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2491395090c8759d889366b53433aee68fe3dbdc..a96372e00dc051199f4443f2edc97706e4a1a901 100644 (file)
--- 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
 }
 
 #endif // wxUSE_ACCEL

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index de0b18636ff5872b24400b996947fbe791565419..d0b20891bbf5f33feea8877add9c68e3a2f5d359 100644 (file)
--- 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") );
         }
     }
                 wxFAIL_MSG( wxT("unknown keyboard accel") );
         }
     }

+    if (accel)
+        delete accel;

 
     return hotkey;
 }
 
     return hotkey;
 }

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index de0b18636ff5872b24400b996947fbe791565419..d0b20891bbf5f33feea8877add9c68e3a2f5d359 100644 (file)
--- 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") );
         }
     }
                 wxFAIL_MSG( wxT("unknown keyboard accel") );
         }
     }

+    if (accel)
+        delete accel;

 
     return hotkey;
 }
 
     return hotkey;
 }