package/x11/wxwidgets24/gtk.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../wxwidgets24/gtk.patch
   5 # Copyright (C) 2004 - 2005 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16 diff -Naur wxPythonSrc-2.4.2.4_orig/src/gtk/menu.cpp wxPythonSrc-2.4.2.4/src/gtk/menu.cpp
  17 --- wxPythonSrc-2.4.2.4_orig/src/gtk/menu.cpp   2003-09-22 21:09:53.000000000 +0200
  18 +++ wxPythonSrc-2.4.2.4/src/gtk/menu.cpp        2005-03-31 15:59:17.027519408 +0200
  19 @@ -30,13 +30,13 @@
  20  #ifdef __WXGTK20__
  21      #include <glib-object.h>
  22
  23 -    #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
  24 -    #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
  25 +    #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
  26 +    #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
  27      #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
  28
  29 -    #define ACCEL_OBJECT        GObject
  30 +    #define ACCEL_OBJECT        GtkWindow
  31      #define ACCEL_OBJECTS(a)    (a)->acceleratables
  32 -    #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
  33 +    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
  34  #else // GTK+ 1.x
  35      #define ACCEL_OBJECT        GtkObject
  36      #define ACCEL_OBJECTS(a)    (a)->attach_objects
  37 diff -Naur wxPythonSrc-2.4.2.4_orig/src/gtk/settings.cpp wxPythonSrc-2.4.2.4/src/gtk/settings.cpp
  38 --- wxPythonSrc-2.4.2.4_orig/src/gtk/settings.cpp       2003-06-25 21:12:40.000000000 +0200
  39 +++ wxPythonSrc-2.4.2.4/src/gtk/settings.cpp    2005-03-31 15:59:17.028519256 +0200
  40 @@ -340,9 +340,20 @@
  41                  }
  42                  else
  43                  {
  44 -                    const gchar *font_name =
  45 -                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
  46 -                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
  47 +                    GtkSettings *settings = gtk_settings_get_default();
  48 +                    gchar *font_name = NULL;
  49 +                    g_object_get ( settings,
  50 +                                   "gtk-font-name",
  51 +                                   &font_name,
  52 +                                   NULL);
  53 +
  54 +                    if (!font_name)
  55 +                            g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
  56 +
  57 +                    else
  58 +                           g_systemFont = new wxFont(wxString::FromAscii(font_name));
  59 +                    g_free (font_name);
  60 +
  61                  }
  62                  gtk_widget_destroy( widget );
  63  #else