Augmented version to b5

  Disabled F10 thing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index 433006db2e674e6ed5239cc9f560d6984fc81c61..19674c17dfbe31978b47e3fd9d3bcd9255b138fd 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -57,7 +57,7 @@ this has no effect, but I tried...
 -----------------------
 
 wxWindows/GTK requires the GTK+ library to be installed on your system.
 -----------------------
 
 wxWindows/GTK requires the GTK+ library to be installed on your system.

-It has to be a stable version, preferebly version 1.2.1. You can use
+It has to be a stable version, preferebly version 1.2.3. You can use

 GTK 1.0.X in connection with wxWindows, but we don't support Drag'n'Drop
 for GTK 1.0.X so you have to "configure --without-dnd". wxWindows does 
 NOT work with the 1.1.X versions of the GTK+ library.
 GTK 1.0.X in connection with wxWindows, but we don't support Drag'n'Drop
 for GTK 1.0.X so you have to "configure --without-dnd". wxWindows does 
 NOT work with the 1.1.X versions of the GTK+ library.

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index b63774e4b253ca355283e874441b311e5c3c47c9..c5553f36fb92dbef11b8292a229443dae5006f6b 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,5 +1,5 @@
 
 

-  Welcome to wxWindows/Gtk 2.1 snapshot 4,
+  Welcome to wxWindows/Gtk 2.1 snapshot 5,

 
 you have downloaded version 2.1 of the GTK+ 1.2 port of 
 the wxWindows GUI library. This is a developers release
 
 you have downloaded version 2.1 of the GTK+ 1.2 port of 
 the wxWindows GUI library. This is a developers release


@@ -24,8 +24,8 @@ many systems (when using GTK 1.0 read the INSTALL.txt):
 ./configure
 make
 su <type root password>
 ./configure
 make
 su <type root password>

-ldconfig

 make install
 make install

+ldconfig

 exit
 
 Type the following to make the samples
 exit
 
 Type the following to make the samples


@@ -50,7 +50,7 @@ this has no effect, but I tried...
 The library produced by the install process will be called 
 libwx_gtk2.a (static) and libwx_gtk2.so.1.0 (shared) so that 
 once a binary incompatible version of wxWindows/Gtk comes out 
 The library produced by the install process will be called 
 libwx_gtk2.a (static) and libwx_gtk2.so.1.0 (shared) so that 
 once a binary incompatible version of wxWindows/Gtk comes out 

-we'll augment library version number to avoid linking problems.
+we'll augment the library version number to avoid linking problems.

 
 Please send problems concerning installation, feature requests, 
 bug reports or comments to the wxWindows users Information on 
 
 Please send problems concerning installation, feature requests, 
 bug reports or comments to the wxWindows users Information on 


@@ -58,7 +58,7 @@ how to subscribe is available from my homepage.
 
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be
 
 wxWindows/Gtk doesn't come with any guarantee whatsoever. It might 
 crash your harddisk or destroy your monitor. It doesn't claim to be

-suitable for any special purpose.
+suitable for any special or general purpose.

 
   Regards,
 
 
   Regards,
 

diff --git a/include/wx/version.h b/include/wx/version.h
index 6cb9ff1ef0f376a15c457dc3ccd5538f218400fe..28e04c540579310a60e66f78184466445227329a 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING "wxWindows 2.1.0"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING "wxWindows 2.1.0"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER

-#define wxBETA_NUMBER      4
+#define wxBETA_NUMBER      5

 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 691f76d0c9645f25976ef4ef9d36e37885d9c401..3f6360750e5e8a06c9f7731b2ecaf4dc4317a9ff 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -553,7 +553,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
       printf( "ControlUp.\n" );
     printf( "\n" );
 */
       printf( "ControlUp.\n" );
     printf( "\n" );
 */

-

     int x = 0;
     int y = 0;
     GdkModifierType state;
     int x = 0;
     int y = 0;
     GdkModifierType state;


@@ -656,11 +655,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
                    if (node)
                    {
                         wxMenu *firstMenu = (wxMenu*) node->Data();
                    if (node)
                    {
                         wxMenu *firstMenu = (wxMenu*) node->Data();

-                        gtk_menu_shell_select_item(
-                         GTK_MENU_SHELL(menubar->m_menubar),
-                         firstMenu->m_owner );
-                         
-                       ret = TRUE;
+                       // doesn't work correctly
+                       // gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
+                       // ret = TRUE;

                        break;
                    }
                }
                        break;
                    }
                }

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 691f76d0c9645f25976ef4ef9d36e37885d9c401..3f6360750e5e8a06c9f7731b2ecaf4dc4317a9ff 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -553,7 +553,6 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
       printf( "ControlUp.\n" );
     printf( "\n" );
 */
       printf( "ControlUp.\n" );
     printf( "\n" );
 */

-

     int x = 0;
     int y = 0;
     GdkModifierType state;
     int x = 0;
     int y = 0;
     GdkModifierType state;


@@ -656,11 +655,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
                    if (node)
                    {
                         wxMenu *firstMenu = (wxMenu*) node->Data();
                    if (node)
                    {
                         wxMenu *firstMenu = (wxMenu*) node->Data();

-                        gtk_menu_shell_select_item(
-                         GTK_MENU_SHELL(menubar->m_menubar),
-                         firstMenu->m_owner );
-                         
-                       ret = TRUE;
+                       // doesn't work correctly
+                       // gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
+                       // ret = TRUE;

                        break;
                    }
                }
                        break;
                    }
                }

diff --git a/wxGTK.spec b/wxGTK.spec
index cdf096bff91490c2bc83a1000805fde05f2fe5a6..5dadc5c990f50d84cc5e5be04c67ad2450b35413 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,7 +1,7 @@
 # Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.1.0
 # Note that this is NOT a relocatable package
 %define pref /usr
 %define ver 2.1.0

-%define rel 4
+%define rel 5

 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK
 
 Summary: The GTK+ 1.2 port of the wxWindows library
 Name: wxGTK


@@ -9,7 +9,7 @@ Version: %{ver}
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries
 Release: %{rel}
 Copyright: wxWindows Licence
 Group: X11/Libraries

-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b4.tgz
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK-2.1.0-b5.tgz

 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.2.1
 URL: http://wesley.informatik.uni-freiburg.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.2.1