Fixed coding of a switch statement that had RETURN statements before the BREAK statem...

[wxWidgets.git] / src / gtk1 / window.cpp
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp

index cc9855afaeae11b3a635d3ff4a7bbdf7c3c502f4..01d6e259a24214450e94f9b8a74bc39f17d19659 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1,5 +1,5 @@
  /////////////////////////////////////////////////////////////////////////////
  /////////////////////////////////////////////////////////////////////////////
-// Name:        window.cpp
+// Name:        gtk/window.cpp
  // Purpose:
  // Author:      Robert Roebling
  // Id:          $Id$
  // Purpose:
  // Author:      Robert Roebling
  // Id:          $Id$
@@ -12,9 +12,13 @@
      #pragma implementation "window.h"
  #endif
  
      #pragma implementation "window.h"
  #endif
  
+#ifdef __VMS
+#define XWarpPointer XWARPPOINTER
+#endif
+
  #include "wx/defs.h"
  #include "wx/window.h"
  #include "wx/defs.h"
  #include "wx/window.h"
-#include "wx/dc.h"
+#include "wx/dcclient.h"
  #include "wx/frame.h"
  #include "wx/app.h"
  #include "wx/layout.h"
  #include "wx/frame.h"
  #include "wx/app.h"
  #include "wx/layout.h"
@@ -30,23 +34,36 @@
      #include "wx/tooltip.h"
  #endif
  
      #include "wx/tooltip.h"
  #endif
  
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
+#if wxUSE_TEXTCTRL
+#include "wx/textctrl.h"
+#endif
+
  #include "wx/menu.h"
  #include "wx/statusbr.h"
  #include "wx/intl.h"
  #include "wx/settings.h"
  #include "wx/log.h"
  
  #include "wx/menu.h"
  #include "wx/statusbr.h"
  #include "wx/intl.h"
  #include "wx/settings.h"
  #include "wx/log.h"
  
+#ifdef __WXDEBUG__
+    #include "wx/thread.h"
+#endif
+
  #include <math.h>
  
  #include <math.h>
  
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkkeysyms.h"
-#include "wx/gtk/win_gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
  
  
-#if (GTK_MINOR_VERSION == 0)
-#include "gdk/gdkx.h"
-#endif
+#include <gtk/gtk.h>
+#include <gtk/gtkprivate.h>
+
+#include "wx/gtk/win_gtk.h"
  
  //-----------------------------------------------------------------------------
  // documentation on internals
  
  //-----------------------------------------------------------------------------
  // documentation on internals
@@ -59,6 +76,8 @@
     some more information about what the wxWindow, which is the base class
     for all other window classes, does seems required as well.
  
     some more information about what the wxWindow, which is the base class
     for all other window classes, does seems required as well.
  
+   I)
+
     What does wxWindow do? It contains the common interface for the following
     jobs of its descendants:
  
     What does wxWindow do? It contains the common interface for the following
     jobs of its descendants:
  
@@ -84,6 +103,8 @@
     5) A multitude of helper or extra methods for special purposes, such as
     Drag'n'Drop, managing validators etc.
  
     5) A multitude of helper or extra methods for special purposes, such as
     Drag'n'Drop, managing validators etc.
  
+   6) Display a border (sunken, raised, simple or none).
+
     Normally one might expect, that one wxWindows window would always correspond
     to one GTK widget. Under GTK, there is no such allround widget that has all
     the functionality. Moreover, the GTK defines a client area as a different
     Normally one might expect, that one wxWindows window would always correspond
     to one GTK widget. Under GTK, there is no such allround widget that has all
     the functionality. Moreover, the GTK defines a client area as a different
@@ -104,25 +125,74 @@
     can find in m_widget (defined in wxWindow)
  
     When the class has a client area for drawing into and for containing children
     can find in m_widget (defined in wxWindow)
  
     When the class has a client area for drawing into and for containing children
-   it has to handle the client area widget (of the type GtkMyFixed, defined in
+   it has to handle the client area widget (of the type GtkPizza, defined in
     win_gtk.c), but there could be any number of widgets, handled by a class
     The common rule for all windows is only, that the widget that interacts with
     the rest of GTK must be referenced in m_widget and all other widgets must be
     children of this widget on the GTK level. The top-most widget, which also
     represents the client area, must be in the m_wxwindow field and must be of
     win_gtk.c), but there could be any number of widgets, handled by a class
     The common rule for all windows is only, that the widget that interacts with
     the rest of GTK must be referenced in m_widget and all other widgets must be
     children of this widget on the GTK level. The top-most widget, which also
     represents the client area, must be in the m_wxwindow field and must be of
-   the type GtkMyFixed.
+   the type GtkPizza.
  
     As I said, the window classes that display a GTK native widget only have
     one widget, so in the case of e.g. the wxButton class m_widget holds a
     pointer to a GtkButton widget. But windows with client areas (for drawing
     and children) have a m_widget field that is a pointer to a GtkScrolled-
  
     As I said, the window classes that display a GTK native widget only have
     one widget, so in the case of e.g. the wxButton class m_widget holds a
     pointer to a GtkButton widget. But windows with client areas (for drawing
     and children) have a m_widget field that is a pointer to a GtkScrolled-
-   Window and a m_wxwindow field that is pointer to a GtkMyFixed and this
+   Window and a m_wxwindow field that is pointer to a GtkPizza and this
     one is (in the GTK sense) a child of the GtkScrolledWindow.
  
     If the m_wxwindow field is set, then all input to this widget is inter-
     cepted and sent to the wxWindows class. If not, all input to the widget
     that gets pointed to by m_widget gets intercepted and sent to the class.
  
     one is (in the GTK sense) a child of the GtkScrolledWindow.
  
     If the m_wxwindow field is set, then all input to this widget is inter-
     cepted and sent to the wxWindows class. If not, all input to the widget
     that gets pointed to by m_widget gets intercepted and sent to the class.
  
+   II)
+
+   The design of scrolling in wxWindows is markedly different from that offered
+   by the GTK itself and therefore we cannot simply take it as it is. In GTK,
+   clicking on a scrollbar belonging to scrolled window will inevitably move
+   the window. In wxWindows, the scrollbar will only emit an event, send this
+   to (normally) a wxScrolledWindow and that class will call ScrollWindow()
+   which actually moves the window and its subchildren. Note that GtkPizza
+   memorizes how much it has been scrolled but that wxWindows forgets this
+   so that the two coordinates systems have to be kept in synch. This is done
+   in various places using the pizza->xoffset and pizza->yoffset values.
+
+   III)
+
+   Singularily the most broken code in GTK is the code that is supposes to
+   inform subwindows (child windows) about new positions. Very often, duplicate
+   events are sent without changes in size or position, equally often no
+   events are sent at all (All this is due to a bug in the GtkContainer code
+   which got fixed in GTK 1.2.6). For that reason, wxGTK completely ignores
+   GTK's own system and it simply waits for size events for toplevel windows
+   and then iterates down the respective size events to all window. This has
+   the disadvantage, that windows might get size events before the GTK widget
+   actually has the reported size. This doesn't normally pose any problem, but
+   the OpenGl drawing routines rely on correct behaviour. Therefore, I have
+   added the m_nativeSizeEvents flag, which is true only for the OpenGL canvas,
+   i.e. the wxGLCanvas will emit a size event, when (and not before) the X11
+   window that is used for OpenGl output really has that size (as reported by
+   GTK).
+
+   IV)
+
+   If someone at some point of time feels the immense desire to have a look at,
+   change or attempt to optimse the Refresh() logic, this person will need an
+   intimate understanding of what a "draw" and what an "expose" events are and
+   what there are used for, in particular when used in connection with GTK's
+   own windowless widgets. Beware.
+
+   V)
+
+   Cursors, too, have been a constant source of pleasure. The main difficulty
+   is that a GdkWindow inherits a cursor if the programmer sets a new cursor
+   for the parent. To prevent this from doing too much harm, I use idle time
+   to set the cursor over and over again, starting from the toplevel windows
+   and ending with the youngest generation (speaking of parent and child windows).
+   Also don't forget that cursors (like much else) are connected to GdkWindows,
+   not GtkWidgets and that the "window" field of a GtkWidget might very well
+   point to the GdkWindow of the parent widget (-> "window less widget") and
+   that the two obviously have very different meanings.
+
  */
  
  //-----------------------------------------------------------------------------
  */
  
  //-----------------------------------------------------------------------------
@@ -132,22 +202,56 @@
  extern wxList     wxPendingDelete;
  extern bool       g_blockEventsOnDrag;
  extern bool       g_blockEventsOnScroll;
  extern wxList     wxPendingDelete;
  extern bool       g_blockEventsOnDrag;
  extern bool       g_blockEventsOnScroll;
-static bool       g_capturing = FALSE;
-static wxWindow  *g_focusWindow = (wxWindow*) NULL;
+extern wxCursor   g_globalCursor;
+
+// mouse capture state: the window which has it and if the mouse is currently
+// inside it
+static wxWindowGTK  *g_captureWindow = (wxWindowGTK*) NULL;
+static bool g_captureWindowHasMouse = FALSE;
+
+/* extern */ wxWindowGTK  *g_focusWindow = (wxWindowGTK*) NULL;
+
+// the last window which had the focus - this is normally never NULL (except
+// if we never had focus at all) as even when g_focusWindow is NULL it still
+// keeps its previous value
+static wxWindowGTK *g_focusWindowLast = (wxWindowGTK *)NULL;
+
+// the frame that is currently active (i.e. its child has focus). It is
+// used to generate wxActivateEvents
+static wxWindowGTK *g_activeFrame = (wxWindowGTK *)NULL;
+static bool g_activeFrameLostFocus = FALSE;
+
+// if we detect that the app has got/lost the focus, we set this variable to
+// either TRUE or FALSE and an activate event will be sent during the next
+// OnIdle() call and it is reset to -1: this value means that we shouldn't
+// send any activate events at all
+static int        g_sendActivateEvent = -1;
  
  /* hack: we need something to pass to gtk_menu_popup, so we store the time of
     the last click here */
  static guint32 gs_timeLastClick = 0;
  
  
  /* hack: we need something to pass to gtk_menu_popup, so we store the time of
     the last click here */
  static guint32 gs_timeLastClick = 0;
  
+extern bool g_mainThreadLocked;
+
  //-----------------------------------------------------------------------------
  // debug
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  // debug
  //-----------------------------------------------------------------------------
  
+#ifndef __WXGTK20__
+#define DISABLE_STYLE_IF_BROKEN_THEME 1
+#endif
+
  #ifdef __WXDEBUG__
  
  #ifdef __WXDEBUG__
  
+#if wxUSE_THREADS
+#   define DEBUG_MAIN_THREAD if (wxThread::IsMain() && g_mainThreadLocked) printf("gui reentrance");
+#else
+#   define DEBUG_MAIN_THREAD
+#endif
+
  static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                           GdkEvent *WXUNUSED(event),
  static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
                                           GdkEvent *WXUNUSED(event),
-                                         const wxChar *name )
+                                         const wxChar *WXUNUSED(name) )
  {
  /*
      static bool s_done = FALSE;
  {
  /*
      static bool s_done = FALSE;
@@ -156,7 +260,7 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
          wxLog::AddTraceMask("focus");
          s_done = TRUE;
      }
          wxLog::AddTraceMask("focus");
          s_done = TRUE;
      }
-    wxLogTrace(_T("FOCUS NOW AT: %s"), name);
+    wxLogTrace(wxT("FOCUS NOW AT: %s"), name);
  */
  
      return FALSE;
  */
  
      return FALSE;
@@ -164,20 +268,66 @@ static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget),
  
  void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
  {
  
  void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
  {
-    wxString tmp = name;
-    tmp += _T(" FROM ");
-    tmp += window;
+    // suppress warnings about gtk_debug_focus_in_callback being unused with
+    // this "if ( 0 )"
+    if ( 0 )
+    {
+        wxString tmp = name;
+        tmp += wxT(" FROM ");
+        tmp += window;
  
  
-    wxChar *s = new wxChar[tmp.Length()+1];
+        wxChar *s = new wxChar[tmp.Length()+1];
  
  
-    wxStrcpy( s, tmp );
+        wxStrcpy( s, tmp );
  
  
-    gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
-      GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
+        gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
+          GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
+    }
  }
  
  }
  
+#else
+#define DEBUG_MAIN_THREAD
  #endif // Debug
  
  #endif // Debug
  
+//-----------------------------------------------------------------------------
+// missing gdk functions
+//-----------------------------------------------------------------------------
+
+void
+gdk_window_warp_pointer (GdkWindow      *window,
+                         gint            x,
+                         gint            y)
+{
+#ifndef __WXGTK20__
+  GdkWindowPrivate *priv;
+#endif
+
+  if (!window)
+    window = GDK_ROOT_PARENT();
+
+#ifdef __WXGTK20__
+  if (!GDK_WINDOW_DESTROYED(window))
+  {
+      XWarpPointer (GDK_WINDOW_XDISPLAY(window),
+                    None,              /* not source window -> move from anywhere */
+                    GDK_WINDOW_XID(window),  /* dest window */
+                    0, 0, 0, 0,        /* not source window -> move from anywhere */
+                    x, y );
+  }
+#else
+  priv = (GdkWindowPrivate*) window;
+
+  if (!priv->destroyed)
+  {
+      XWarpPointer (priv->xdisplay,
+                    None,              /* not source window -> move from anywhere */
+                    priv->xwindow,  /* dest window */
+                    0, 0, 0, 0,        /* not source window -> move from anywhere */
+                    x, y );
+  }
+#endif
+}
+
  //-----------------------------------------------------------------------------
  // idle system
  //-----------------------------------------------------------------------------
  //-----------------------------------------------------------------------------
  // idle system
  //-----------------------------------------------------------------------------
@@ -186,35 +336,182 @@ extern void wxapp_install_idle_handler();
  extern bool g_isIdle;
  
  //-----------------------------------------------------------------------------
  extern bool g_isIdle;
  
  //-----------------------------------------------------------------------------
-// key event conversion routines
+// local code (see below)
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-#if (GTK_MINOR_VERSION == 0)
-static guint
-gdk_keyval_to_upper (guint       keyval)
+// returns the child of win which currently has focus or NULL if not found
+//
+// Note: can't be static, needed by textctrl.cpp.
+wxWindow *wxFindFocusedChild(wxWindowGTK *win)
  {
  {
-  if (keyval)
+    wxWindow *winFocus = wxWindowGTK::FindFocus();
+    if ( !winFocus )
+        return (wxWindow *)NULL;
+
+    if ( winFocus == win )
+        return (wxWindow *)win;
+
+    for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
      {
      {
-      KeySym lower_val = 0;
-      KeySym upper_val = 0;
-      
-      XConvertCase (keyval, &lower_val, &upper_val);
-      return upper_val;
+        wxWindow *child = wxFindFocusedChild(node->GetData());
+        if ( child )
+            return child;
      }
      }
-  return 0;
+
+    return (wxWindow *)NULL;
  }
  }
-#endif
  
  
-static long map_to_unmodified_wx_keysym( KeySym keysym )
+// Returns toplevel grandparent of given window:
+static wxWindowGTK* wxGetTopLevelParent(wxWindowGTK *win)
  {
  {
-    guint key_code = 0;
+    wxWindowGTK *p = win;
+    while (p && !p->IsTopLevel())
+         p = p->GetParent();
+    return p;
+}
  
  
-    switch (keysym)
+
+static void draw_frame( GtkWidget *widget, wxWindowGTK *win )
+{
+    // wxUniversal widgets draw the borders and scrollbars themselves
+#ifndef __WXUNIVERSAL__
+    if (!win->m_hasVMT)
+        return;
+
+    int dw = 0;
+    int dh = 0;
+
+    if (win->m_hasScrolling)
+    {
+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
+
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
+
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
+
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(widget) );
+
+            if (scroll_window->vscrollbar_visible)
+            {
+                dw += vscroll_req.width;
+                dw += scroll_class->scrollbar_spacing;
+            }
+
+            if (scroll_window->hscrollbar_visible)
+            {
+                dh += hscroll_req.height;
+                dh += scroll_class->scrollbar_spacing;
+            }
+    }
+
+    int dx = 0;
+    int dy = 0;
+    if (GTK_WIDGET_NO_WINDOW (widget))
+    {
+        dx += widget->allocation.x;
+        dy += widget->allocation.y;
+    }
+
+    if (win->HasFlag(wxRAISED_BORDER))
+    {
+        gtk_draw_shadow( widget->style,
+                         widget->window,
+                         GTK_STATE_NORMAL,
+                         GTK_SHADOW_OUT,
+                         dx, dy,
+                         widget->allocation.width-dw, widget->allocation.height-dh );
+        return;
+    }
+
+    if (win->HasFlag(wxSUNKEN_BORDER))
+    {
+        gtk_draw_shadow( widget->style,
+                         widget->window,
+                         GTK_STATE_NORMAL,
+                         GTK_SHADOW_IN,
+                         dx, dy,
+                         widget->allocation.width-dw, widget->allocation.height-dh );
+        return;
+    }
+
+    if (win->HasFlag(wxSIMPLE_BORDER))
+    {
+        GdkGC *gc;
+        gc = gdk_gc_new( widget->window );
+        gdk_gc_set_foreground( gc, &widget->style->black );
+        gdk_draw_rectangle( widget->window, gc, FALSE,
+                         dx, dy,
+                         widget->allocation.width-dw-1, widget->allocation.height-dh-1 );
+        gdk_gc_unref( gc );
+        return;
+    }
+#endif // __WXUNIVERSAL__
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" of m_widget
+//-----------------------------------------------------------------------------
+
+gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindowGTK *win )
+{
+    if (gdk_event->count > 0) return FALSE;
+
+    draw_frame( widget, win );
+
+    return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_widget
+//-----------------------------------------------------------------------------
+
+static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win )
+{
+    draw_frame( widget, win );
+}
+
+//-----------------------------------------------------------------------------
+// key code mapping routines
+//-----------------------------------------------------------------------------
+
+static long map_to_unmodified_wx_keysym( GdkEventKey *event )
+{
+    // VZ: it seems that GDK_KEY_RELEASE event doesn't set event->string
+    //     but only event->keyval which is quite useless to us, so remember
+    //     the last character from GDK_KEY_PRESS and resue it as last resort
+    //
+    // NB: should be MT-neutral as always called from main thread only
+    static struct
+    {
+        KeySym keysym;
+        long   keycode;
+    } s_lastKeyPress = { 0, 0 };
+
+    KeySym keysym = event->keyval;
+    long key_code;
+
+    switch ( keysym )
      {
          case GDK_Shift_L:
          case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
          case GDK_Control_L:
          case GDK_Control_R:     key_code = WXK_CONTROL;     break;
      {
          case GDK_Shift_L:
          case GDK_Shift_R:       key_code = WXK_SHIFT;       break;
          case GDK_Control_L:
          case GDK_Control_R:     key_code = WXK_CONTROL;     break;
+        case GDK_Meta_L:
+        case GDK_Meta_R:
+        case GDK_Alt_L:
+        case GDK_Alt_R:
+        case GDK_Super_L:
+        case GDK_Super_R:       key_code = WXK_ALT;         break;
          case GDK_Menu:          key_code = WXK_MENU;        break;
          case GDK_Help:          key_code = WXK_HELP;        break;
          case GDK_BackSpace:     key_code = WXK_BACK;        break;
          case GDK_Menu:          key_code = WXK_MENU;        break;
          case GDK_Help:          key_code = WXK_HELP;        break;
          case GDK_BackSpace:     key_code = WXK_BACK;        break;
@@ -281,7 +578,7 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
          case GDK_KP_Subtract:  key_code = WXK_NUMPAD_SUBTRACT;  break;
          case GDK_KP_Decimal:   key_code = WXK_NUMPAD_DECIMAL;   break;
          case GDK_KP_Divide:    key_code = WXK_NUMPAD_DIVIDE;    break;
          case GDK_KP_Subtract:  key_code = WXK_NUMPAD_SUBTRACT;  break;
          case GDK_KP_Decimal:   key_code = WXK_NUMPAD_DECIMAL;   break;
          case GDK_KP_Divide:    key_code = WXK_NUMPAD_DIVIDE;    break;
-    
+
          case GDK_F1:            key_code = WXK_F1;          break;
          case GDK_F2:            key_code = WXK_F2;          break;
          case GDK_F3:            key_code = WXK_F3;          break;
          case GDK_F1:            key_code = WXK_F1;          break;
          case GDK_F2:            key_code = WXK_F2;          break;
          case GDK_F3:            key_code = WXK_F3;          break;
@@ -296,20 +593,50 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
          case GDK_F12:           key_code = WXK_F12;         break;
          default:
          {
          case GDK_F12:           key_code = WXK_F12;         break;
          default:
          {
-            if (keysym <= 0xFF)
+            // do we have the translation?
+            if ( event->length == 1 )
+            {
+                keysym = (KeySym)event->string[0];
+            }
+            else if ( (keysym & 0xFF) != keysym )
              {
              {
-                guint upper = gdk_keyval_to_upper( keysym );
-                keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */
-                key_code = keysym;
+                // non ASCII key, what to do?
+
+                if ( event->type == GDK_KEY_RELEASE )
+                {
+                    // reuse the one from the last keypress if any
+                    if ( keysym == s_lastKeyPress.keysym )
+                    {
+                        key_code = s_lastKeyPress.keycode;
+
+                        // skip "return 0"
+                        break;
+                    }
+                }
+
+                // ignore this one, we don't know it
+                return 0;
+            }
+            //else: ASCII key, ok
+
+            guint upper = gdk_keyval_to_upper( (guint)keysym );
+            key_code = upper ? upper : keysym;
+
+            if ( event->type == GDK_KEY_PRESS )
+            {
+                // remember it to be reused below later
+                s_lastKeyPress.keysym = keysym;
+                s_lastKeyPress.keycode = key_code;
              }
          }
      }
  
              }
          }
      }
  
-    return (key_code);
+    return key_code;
  }
  
  }
  
-static long map_to_wx_keysym( KeySym keysym )
+static long map_to_wx_keysym( GdkEventKey *event )
  {
  {
+    KeySym keysym = event->keyval;
      guint key_code = 0;
  
      switch (keysym)
      guint key_code = 0;
  
      switch (keysym)
@@ -380,7 +707,7 @@ static long map_to_wx_keysym( KeySym keysym )
          case GDK_KP_Subtract:  key_code = '-';   break;
          case GDK_KP_Decimal:   key_code = '.';   break;
          case GDK_KP_Divide:    key_code = '/';   break;
          case GDK_KP_Subtract:  key_code = '-';   break;
          case GDK_KP_Decimal:   key_code = '.';   break;
          case GDK_KP_Divide:    key_code = '/';   break;
-    
+
          case GDK_F1:            key_code = WXK_F1;          break;
          case GDK_F2:            key_code = WXK_F2;          break;
          case GDK_F3:            key_code = WXK_F3;          break;
          case GDK_F1:            key_code = WXK_F1;          break;
          case GDK_F2:            key_code = WXK_F2;          break;
          case GDK_F3:            key_code = WXK_F3;          break;
@@ -394,198 +721,321 @@ static long map_to_wx_keysym( KeySym keysym )
          case GDK_F11:           key_code = WXK_F11;         break;
          case GDK_F12:           key_code = WXK_F12;         break;
          default:
          case GDK_F11:           key_code = WXK_F11;         break;
          case GDK_F12:           key_code = WXK_F12;         break;
          default:
-        {
-            if (keysym <= 0xFF)
+            if (event->length == 1)
              {
              {
-                key_code = keysym;
+                key_code = (unsigned char)*event->string;
+            }
+            else if ((keysym & 0xFF) == keysym)
+            {
+                key_code = (guint)keysym;
              }
              }
-        }
      }
  
      }
  
-    return (key_code);
+    return key_code;
  }
  
  //-----------------------------------------------------------------------------
  }
  
  //-----------------------------------------------------------------------------
-// local code (see below)
+// "size_request" of m_widget
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-#if (GTK_MINOR_VERSION > 0)
+static void gtk_window_size_request_callback( GtkWidget *widget, GtkRequisition *requisition, wxWindow *win )
+{
+    int w,h;
+    win->GetSize( &w, &h );
+    if (w < 2) w = 2;
+    if (h < 2) h = 2;
+
+    requisition->height = h;
+    requisition->width = w;
+}
  
  
-static void draw_frame( GtkWidget *widget, wxWindow *win )
+//-----------------------------------------------------------------------------
+// "expose_event" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static int gtk_window_expose_callback( GtkWidget *widget,
+                                       GdkEventExpose *gdk_event,
+                                       wxWindow *win )
  {
  {
-    if (!win->m_hasVMT)
-        return;
+    DEBUG_MAIN_THREAD
  
  
-    int dw = 0;
-    int dh = 0;
+    if (g_isIdle)
+        wxapp_install_idle_handler();
  
  
-    if (win->HasScrolling())
+/*
+    if (win->GetName() == wxT("panel"))
      {
      {
-        GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
-        GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
+        wxPrintf( wxT("OnExpose from ") );
+        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+            wxPrintf( win->GetClassInfo()->GetClassName() );
+        wxPrintf( wxT(" %d %d %d %d\n"), (int)gdk_event->area.x,
+                                         (int)gdk_event->area.y,
+                                         (int)gdk_event->area.width,
+                                         (int)gdk_event->area.height );
+    }
+*/
  
  
-/*
-            GtkWidget *hscrollbar = scroll_window->hscrollbar;
-            GtkWidget *vscrollbar = scroll_window->vscrollbar;
+    GtkPizza *pizza = GTK_PIZZA (widget);
  
  
-            we use this instead:  range.slider_width = 11 + 2*2pts edge
-*/
+    if (win->GetThemeEnabled())
+    {
+        wxWindow *parent = win->GetParent();
+        while (parent && !parent->IsTopLevel())
+            parent = parent->GetParent();
+        if (!parent)
+            parent = win;
+
+        gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL,
+            GTK_SHADOW_NONE, &gdk_event->area, parent->m_widget, "base", 0, 0, -1, -1);
+    }
  
  
-        if (scroll_window->vscrollbar_visible)
-        {
-            dw += 15;   /* dw += vscrollbar->allocation.width; */
-            dw += scroll_class->scrollbar_spacing;
-        }
+    win->GetUpdateRegion().Union( gdk_event->area.x,
+                                  gdk_event->area.y,
+                                  gdk_event->area.width,
+                                  gdk_event->area.height );
  
  
-        if (scroll_window->hscrollbar_visible)
+    if (gdk_event->count == 0)
+    {
+        win->m_clipPaintRegion = TRUE;
+
+        wxWindowDC dc(win);
+        dc.SetClippingRegion(win->GetUpdateRegion());
+        wxEraseEvent eevent( win->GetId(), &dc );
+        eevent.SetEventObject( win );
+#if 1
+        (void)win->GetEventHandler()->ProcessEvent(eevent);
+#else // 0
+        if (!win->GetEventHandler()->ProcessEvent(eevent))
          {
          {
-            dh += 15;   /* dh += hscrollbar->allocation.height; */
-            dh += scroll_class->scrollbar_spacing;
+            wxClientDC dc( win );
+            dc.SetBrush( wxBrush( win->GetBackgroundColour(), wxSOLID ) );
+            dc.SetPen( *wxTRANSPARENT_PEN );
+
+            wxRegionIterator upd( win->GetUpdateRegion() );
+            while (upd)
+            {
+                dc.DrawRectangle( upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+                upd ++;
+            }
          }
          }
-    }
+#endif // 1/0
  
  
-    int dx = 0;
-    int dy = 0;
-    if (GTK_WIDGET_NO_WINDOW (widget))
-    {
-        dx += widget->allocation.x;
-        dy += widget->allocation.y;
-    }
+        wxNcPaintEvent eventNc( win->GetId() );
+        eventNc.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( eventNc );
  
  
-    if (win->HasFlag(wxRAISED_BORDER))
-    {
-        gtk_draw_shadow( widget->style,
-                         widget->window,
-                         GTK_STATE_NORMAL,
-                         GTK_SHADOW_OUT,
-                         dx, dy,
-                         win->m_width-dw, win->m_height-dh );
-        return;
+        wxPaintEvent event( win->GetId() );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+
+        win->GetUpdateRegion().Clear();
+
+        win->m_clipPaintRegion = FALSE;
      }
  
      }
  
-    if (win->HasFlag(wxSUNKEN_BORDER))
+    /* The following code will result in all window-less widgets
+       being redrawn if the wxWindows class is given a chance to
+       paint *anything* because it will then be allowed to paint
+       over the window-less widgets */
+    GList *children = pizza->children;
+    while (children)
      {
      {
-        gtk_draw_shadow( widget->style,
-                         widget->window,
-                         GTK_STATE_NORMAL,
-                         GTK_SHADOW_IN,
-                         dx, dy,
-                         win->m_width-dw, win->m_height-dh );
-        return;
+        GtkPizzaChild *child = (GtkPizzaChild*) children->data;
+        children = children->next;
+
+        GdkEventExpose child_event = *gdk_event;
+
+        if (GTK_WIDGET_NO_WINDOW (child->widget) &&
+            GTK_WIDGET_DRAWABLE (child->widget) /* &&
+            gtk_widget_intersect (child->widget, &gdk_event->area, &child_event.area)*/ )
+        {
+            child_event.area.x = child->widget->allocation.x;
+            child_event.area.y = child->widget->allocation.y;
+            child_event.area.width = child->widget->allocation.width;
+            child_event.area.height = child->widget->allocation.height;
+            gtk_widget_event (child->widget, (GdkEvent*) &child_event);
+        }
      }
      }
+
+    return TRUE;
  }
  
  //-----------------------------------------------------------------------------
  }
  
  //-----------------------------------------------------------------------------
-// "expose_event" of m_widget
+// "event" of m_wxwindow
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
+/* GTK thinks it is clever and filters out a certain amount of "unneeded"
+   expose events. We need them, of course, so we override the main event
+   procedure in GtkWidget by giving our own handler for all system events.
+   There, we look for expose events ourselves whereas all other events are
+   handled normally. */
+
+gint gtk_window_event_event_callback( GtkWidget *widget,
+                                      GdkEventExpose *event,
+                                      wxWindow *win )
  {
  {
-    if (gdk_event->count > 0) return;
-    draw_frame( widget, win );
+    if (event->type == GDK_EXPOSE)
+    {
+        gint ret = gtk_window_expose_callback( widget, event, win );
+        return ret;
+    }
+
+    return FALSE;
  }
  
  //-----------------------------------------------------------------------------
  // "draw" of m_wxwindow
  //-----------------------------------------------------------------------------
  
  }
  
  //-----------------------------------------------------------------------------
  // "draw" of m_wxwindow
  //-----------------------------------------------------------------------------
  
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
-{
-    draw_frame( widget, win );
-}
-
-#endif // GTK_MINOR_VERSION > 0
+/* This callback is a complete replacement of the gtk_pizza_draw() function,
+   which disabled. */
  
  
-//-----------------------------------------------------------------------------
-// "expose_event" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
+static void gtk_window_draw_callback( GtkWidget *widget,
+                                      GdkRectangle *rect,
+                                      wxWindow *win )
  {
  {
-    if ( !win->m_hasVMT )
-        return;
+    DEBUG_MAIN_THREAD
  
  
-    win->GetUpdateRegion().Union( gdk_event->area.x,
-                                  gdk_event->area.y,
-                                  gdk_event->area.width,
-                                  gdk_event->area.height );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
  
  
-    if ( gdk_event->count > 0 )
+    if ((win->HasFlag(wxNO_FULL_REPAINT_ON_RESIZE)) &&
+        (win->GetChildren().GetCount() == 0))
+    {
          return;
          return;
+    }
  
  /*
  
  /*
-    printf( "OnExpose from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
+    if (win->GetName() == wxT("panel"))
+    {
+        wxPrintf( wxT("OnDraw from ") );
+        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+            wxPrintf( win->GetClassInfo()->GetClassName() );
+        wxPrintf( wxT(" %d %d %d %d\n"), (int)rect->x,
+                                         (int)rect->y,
+                                         (int)rect->width,
+                                         (int)rect->height );
+    }
  */
  
  */
  
-    wxPaintEvent event( win->GetId() );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    GtkPizza *pizza = GTK_PIZZA (widget);
  
  
-    win->GetUpdateRegion().Clear();
-}
+    if (win->GetThemeEnabled())
+    {
+        wxWindow *parent = win->GetParent();
+        while (parent && !parent->IsTopLevel())
+            parent = parent->GetParent();
+        if (!parent)
+            parent = win;
+
+        gtk_paint_flat_box (parent->m_widget->style, pizza->bin_window, GTK_STATE_NORMAL,
+            GTK_SHADOW_NONE, rect, parent->m_widget, "base", 0, 0, -1, -1);
+    }
  
  
-//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
-//-----------------------------------------------------------------------------
  
  
-static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    if (!(GTK_WIDGET_APP_PAINTABLE (widget)) &&
+         (pizza->clear_on_draw))
+    {
+        gdk_window_clear_area( pizza->bin_window,
+                               rect->x, rect->y, rect->width, rect->height);
+    }
  
  
-    if (!win->m_hasVMT)
-        return;
+    win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
+
+    win->m_clipPaintRegion = TRUE;
+
+    wxWindowDC dc(win);
+    dc.SetClippingRegion(win->GetUpdateRegion());
+    wxEraseEvent eevent( win->GetId(), &dc );
+    eevent.SetEventObject( win );
+
+#if 1
+    (void)win->GetEventHandler()->ProcessEvent(eevent);
+#else
+    if (!win->GetEventHandler()->ProcessEvent(eevent))
+    {
+        if (!win->GetEventHandler()->ProcessEvent(eevent))
+        {
+            wxClientDC dc( win );
+            dc.SetBrush( wxBrush( win->GetBackgroundColour(), wxSOLID ) );
+            dc.SetPen( *wxTRANSPARENT_PEN );
+
+            wxRegionIterator upd( win->GetUpdateRegion() );
+            while (upd)
+            {
+                dc.DrawRectangle( upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+                upd ++;
+            }
+        }
+    }
+#endif
  
  
-    win->GetUpdateRegion().Union( rect->x, rect->y,
-                                  rect->width, rect->height );
+    wxNcPaintEvent eventNc( win->GetId() );
+    eventNc.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( eventNc );
  
      wxPaintEvent event( win->GetId() );
      event.SetEventObject( win );
      win->GetEventHandler()->ProcessEvent( event );
  
      win->GetUpdateRegion().Clear();
  
      wxPaintEvent event( win->GetId() );
      event.SetEventObject( win );
      win->GetEventHandler()->ProcessEvent( event );
  
      win->GetUpdateRegion().Clear();
+
+    win->m_clipPaintRegion = FALSE;
+
+
+    GList *children = pizza->children;
+    while (children)
+    {
+            GtkPizzaChild *child = (GtkPizzaChild*) children->data;
+            children = children->next;
+
+            GdkRectangle child_area;
+            if (gtk_widget_intersect (child->widget, rect, &child_area))
+            {
+                gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
+            }
+    }
  }
  
  //-----------------------------------------------------------------------------
  // "key_press_event" from any window
  //-----------------------------------------------------------------------------
  
  }
  
  //-----------------------------------------------------------------------------
  // "key_press_event" from any window
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
+// turn on to see the key event codes on the console
+#undef DEBUG_KEY_EVENTS
+
+static gint gtk_window_key_press_callback( GtkWidget *widget,
+                                           GdkEventKey *gdk_event,
+                                           wxWindow *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
-/*
-    printf( "KeyDown-ScanCode is: %d.\n", gdk_event->keyval );
-    if (gdk_event->state & GDK_SHIFT_MASK)
-      printf( "ShiftDown.\n" );
-    else
-      printf( "ShiftUp.\n" );
-    if (gdk_event->state & GDK_CONTROL_MASK)
-      printf( "ControlDown.\n" );
-    else
-      printf( "ControlUp.\n" );
-    printf( "\n" );
-*/
+
      int x = 0;
      int y = 0;
      GdkModifierType state;
      int x = 0;
      int y = 0;
      GdkModifierType state;
-    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+    if (gdk_event->window)
+        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+
+    bool ret = FALSE;
+
+    long key_code = map_to_unmodified_wx_keysym( gdk_event );
+
+#ifdef DEBUG_KEY_EVENTS
+    wxPrintf(_T("Key press event: %d => %ld\n"), gdk_event->keyval, key_code);
+#endif // DEBUG_KEY_EVENTS
  
  
-    long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval );
-    
      /* sending unknown key events doesn't really make sense */
      /* sending unknown key events doesn't really make sense */
-    if (key_code == 0) return FALSE;
+    if (key_code == 0)
+        return FALSE;
  
  
-    bool ret = FALSE;
-    
-    wxKeyEvent event( wxEVT_KEY_DOWN );         
+    wxKeyEvent event( wxEVT_KEY_DOWN );
      event.SetTimestamp( gdk_event->time );
      event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
      event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
      event.SetTimestamp( gdk_event->time );
      event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
      event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
@@ -597,31 +1047,11 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
      event.m_y = y;
      event.SetEventObject( win );
      ret = win->GetEventHandler()->ProcessEvent( event );
      event.m_y = y;
      event.SetEventObject( win );
      ret = win->GetEventHandler()->ProcessEvent( event );
-    
-    key_code = map_to_wx_keysym( gdk_event->keyval );
-
-    /* wxMSW doesn't send char events with Alt pressed */
-    if ((key_code != 0) &&
-        ((gdk_event->state & GDK_MOD1_MASK) == 0) &&
-        ((gdk_event->state & GDK_MOD1_MASK) == 0))
-    {
-        wxKeyEvent event2( wxEVT_CHAR );                 
-        event2.SetTimestamp( gdk_event->time );
-        event2.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
-        event2.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
-//        event2.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
-//        event2.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
-        event2.m_keyCode = key_code;
-        event2.m_scanCode = gdk_event->keyval;
-        event2.m_x = x;
-        event2.m_y = y;
-        event2.SetEventObject( win );
-        ret = (ret || win->GetEventHandler()->ProcessEvent( event2 ));
-    }
  
  
+#if wxUSE_ACCEL
      if (!ret)
      {
      if (!ret)
      {
-        wxWindow *ancestor = win;
+        wxWindowGTK *ancestor = win;
          while (ancestor)
          {
              int command = ancestor->GetAcceleratorTable()->GetCommand( event );
          while (ancestor)
          {
              int command = ancestor->GetAcceleratorTable()->GetCommand( event );
@@ -631,85 +1061,93 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
                  ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
                  break;
              }
                  ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
                  break;
              }
+            if (ancestor->IsTopLevel())
+                break;
              ancestor = ancestor->GetParent();
          }
      }
              ancestor = ancestor->GetParent();
          }
      }
+#endif // wxUSE_ACCEL
  
  
-    // win is a control: tab can be propagated up
-    if ( (!ret) &&
+    /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
+       will only be sent if it is not in an accelerator table. */
+    if ( !ret )
+    {
+        key_code = map_to_wx_keysym( gdk_event );
+
+        if ( key_code )
+        {
+#ifdef DEBUG_KEY_EVENTS
+            wxPrintf(_T("Char event: %ld\n"), key_code);
+#endif // DEBUG_KEY_EVENTS
+
+            // reuse the ame event object, just change its type and use the
+            // translated keycode instead of the raw one
+            event.SetEventType(wxEVT_CHAR);
+            event.m_keyCode = key_code;
+
+            ret = win->GetEventHandler()->ProcessEvent( event );
+        }
+    }
+
+    /* win is a control: tab can be propagated up */
+    if ( !ret &&
           ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
           ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
-         (win->HasFlag(wxTE_PROCESS_TAB) == 0))
+// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may
+//     have this style, yet choose not to process this particular TAB in which
+//     case TAB must still work as a navigational character
+#if 0
+         !win->HasFlag(wxTE_PROCESS_TAB) &&
+#endif // 0
+         win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
      {
          wxNavigationKeyEvent new_event;
      {
          wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( win->GetParent() );
          /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
          new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
          /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
          new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
          new_event.SetCurrentFocus( win );
          /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
          new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
          /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
          new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
          new_event.SetCurrentFocus( win );
-        ret = win->GetEventHandler()->ProcessEvent( new_event );
+        ret = win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
      }
  
      /* generate wxID_CANCEL if <esc> has been pressed (typically in dialogs) */
      }
  
      /* generate wxID_CANCEL if <esc> has been pressed (typically in dialogs) */
-    if ( (!ret) &&
+    if ( !ret &&
           (gdk_event->keyval == GDK_Escape) )
      {
          wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
          new_event.SetEventObject( win );
          ret = win->GetEventHandler()->ProcessEvent( new_event );
      }
           (gdk_event->keyval == GDK_Escape) )
      {
          wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
          new_event.SetEventObject( win );
          ret = win->GetEventHandler()->ProcessEvent( new_event );
      }
-    
-#if (GTK_MINOR_VERSION > 0)
-    /* pressing F10 will activate the menu bar of the top frame */
+
+    /* Doesn't work. */
+#if 0 // (GTK_MINOR_VERSION > 0)
+    /* Pressing F10 will activate the menu bar of the top frame. */
      if ( (!ret) &&
           (gdk_event->keyval == GDK_F10) )
      {
      if ( (!ret) &&
           (gdk_event->keyval == GDK_F10) )
      {
-        wxWindow *ancestor = win;
+        wxWindowGTK *ancestor = win;
          while (ancestor)
          {
              if (wxIsKindOf(ancestor,wxFrame))
          while (ancestor)
          {
              if (wxIsKindOf(ancestor,wxFrame))
-           {
-               wxFrame *frame = (wxFrame*) ancestor;
+            {
+                wxFrame *frame = (wxFrame*) ancestor;
                  wxMenuBar *menubar = frame->GetMenuBar();
                  wxMenuBar *menubar = frame->GetMenuBar();
-               if (menubar)
-               {
+                if (menubar)
+                {
                      wxNode *node = menubar->GetMenus().First();
                      wxNode *node = menubar->GetMenus().First();
-                   if (node)
-                   {
+                    if (node)
+                    {
                          wxMenu *firstMenu = (wxMenu*) node->Data();
                          wxMenu *firstMenu = (wxMenu*) node->Data();
-                       // doesn't work correctly
-                       // gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
-                       // ret = TRUE;
-                       break;
-                   }
-               }
-           }
+                        gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
+                        ret = TRUE;
+                        break;
+                    }
+                }
+            }
              ancestor = ancestor->GetParent();
          }
      }
              ancestor = ancestor->GetParent();
          }
      }
-#endif
-
-/*
-    Damn, I forgot why this didn't work, but it didn't work.
-
-    // win is a panel: up can be propagated to the panel
-    if ((!ret) && (win->m_wxwindow) && (win->m_parent) && (win->m_parent->AcceptsFocus()) &&
-        (gdk_event->keyval == GDK_Up))
-    {
-        win->m_parent->SetFocus();
-        ret = TRUE;
-    }
-
-    // win is a panel: left/right can be propagated to the panel
-    if ((!ret) && (win->m_wxwindow) &&
-        ((gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Left) ||
-         (gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Down)))
-    {
-        wxNavigationKeyEvent new_event;
-        new_event.SetDirection( (gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Down) );
-        new_event.SetCurrentFocus( win );
-        ret = win->GetEventHandler()->ProcessEvent( new_event );
-    }
-*/
+#endif // 0
  
      if (ret)
      {
  
      if (ret)
      {
@@ -724,36 +1162,30 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
  // "key_release_event" from any window
  //-----------------------------------------------------------------------------
  
  // "key_release_event" from any window
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
+static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
-/*
-    printf( "KeyUp-ScanCode is: %d.\n", gdk_event->keyval );
-    if (gdk_event->state & GDK_SHIFT_MASK)
-      printf( "ShiftDown.\n" );
-    else
-      printf( "ShiftUp.\n" );
-    if (gdk_event->state & GDK_CONTROL_MASK)
-      printf( "ControlDown.\n" );
-    else
-      printf( "ControlUp.\n" );
-    printf( "\n" );
-*/
+    long key_code = map_to_unmodified_wx_keysym( gdk_event );
+
+#ifdef DEBUG_KEY_EVENTS
+    wxPrintf(_T("Key release event: %d => %ld\n"), gdk_event->keyval, key_code);
+#endif // DEBUG_KEY_EVENTS
  
  
-    long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval );
-    
      /* sending unknown key events doesn't really make sense */
      if (key_code == 0) return FALSE;
  
      int x = 0;
      int y = 0;
      GdkModifierType state;
      /* sending unknown key events doesn't really make sense */
      if (key_code == 0) return FALSE;
  
      int x = 0;
      int y = 0;
      GdkModifierType state;
-    if (gdk_event->window) gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+    if (gdk_event->window)
+        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
  
      wxKeyEvent event( wxEVT_KEY_UP );
      event.SetTimestamp( gdk_event->time );
  
      wxKeyEvent event( wxEVT_KEY_UP );
      event.SetTimestamp( gdk_event->time );
@@ -776,20 +1208,79 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
      return FALSE;
  }
  
      return FALSE;
  }
  
+// ============================================================================
+// the mouse events
+// ============================================================================
+
+// init wxMouseEvent with the info from gdk_event
+#define InitMouseEvent(win, event, gdk_event) \
+    { \
+    event.SetTimestamp( gdk_event->time ); \
+    event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); \
+    event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK); \
+    event.m_altDown = (gdk_event->state & GDK_MOD1_MASK); \
+    event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK); \
+    event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK); \
+    event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK); \
+    event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); \
+\
+    wxPoint pt = win->GetClientAreaOrigin(); \
+    event.m_x = (wxCoord)gdk_event->x - pt.x; \
+    event.m_y = (wxCoord)gdk_event->y - pt.y; \
+    }
+
+// ----------------------------------------------------------------------------
+// mouse event processing helper
+// ----------------------------------------------------------------------------
+
+static void AdjustEventButtonState(wxMouseEvent& event)
+{
+    // GDK reports the old state of the button for a button press event, but
+    // for compatibility with MSW and common sense we want m_leftDown be TRUE
+    // for a LEFT_DOWN event, not FALSE, so we will invert
+    // left/right/middleDown for the corresponding click events
+
+    if ((event.GetEventType() == wxEVT_LEFT_DOWN) ||
+        (event.GetEventType() == wxEVT_LEFT_DCLICK) ||
+        (event.GetEventType() == wxEVT_LEFT_UP))
+    {
+        event.m_leftDown = !event.m_leftDown;
+        return;
+    }
+
+    if ((event.GetEventType() == wxEVT_MIDDLE_DOWN) ||
+        (event.GetEventType() == wxEVT_MIDDLE_DCLICK) ||
+        (event.GetEventType() == wxEVT_MIDDLE_UP))
+    {
+        event.m_middleDown = !event.m_middleDown;
+        return;
+    }
+
+    if ((event.GetEventType() == wxEVT_RIGHT_DOWN) ||
+        (event.GetEventType() == wxEVT_RIGHT_DCLICK) ||
+        (event.GetEventType() == wxEVT_RIGHT_UP))
+    {
+        event.m_rightDown = !event.m_rightDown;
+        return;
+    }
+}
+
  //-----------------------------------------------------------------------------
  // "button_press_event"
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  // "button_press_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
+static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
  /*
          wxapp_install_idle_handler();
  
  /*
-    wxPrintf( _T("1) OnButtonPress from ") );
+    wxPrintf( wxT("1) OnButtonPress from ") );
      if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
          wxPrintf( win->GetClassInfo()->GetClassName() );
      if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
          wxPrintf( win->GetClassInfo()->GetClassName() );
-    wxPrintf( _T(".\n") );
+    wxPrintf( wxT(".\n") );
  */
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return TRUE;
  */
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return TRUE;
@@ -804,23 +1295,16 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
              gtk_widget_grab_focus (win->m_wxwindow);
  
  /*
              gtk_widget_grab_focus (win->m_wxwindow);
  
  /*
-            wxPrintf( _T("GrabFocus from ") );
+            wxPrintf( wxT("GrabFocus from ") );
              if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
                  wxPrintf( win->GetClassInfo()->GetClassName() );
              if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
                  wxPrintf( win->GetClassInfo()->GetClassName() );
-            wxPrintf( _T(".\n") );
+            wxPrintf( wxT(".\n") );
  */
  
          }
      }
  
  */
  
          }
      }
  
-/*
-    wxPrintf( _T("2) OnButtonPress from ") );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        wxPrintf( win->GetClassInfo()->GetClassName() );
-    wxPrintf( _T(".\n") );
-*/
-
-    wxEventType event_type = wxEVT_LEFT_DOWN;
+    wxEventType event_type = wxEVT_NULL;
  
      if (gdk_event->button == 1)
      {
  
      if (gdk_event->button == 1)
      {
@@ -850,34 +1334,51 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
          }
      }
  
          }
      }
  
+    if ( event_type == wxEVT_NULL )
+    {
+        // unknown mouse button or click type
+        return FALSE;
+    }
+
      wxMouseEvent event( event_type );
      wxMouseEvent event( event_type );
-    event.SetTimestamp( gdk_event->time );
-    event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
-    event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
-    event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
-    event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
-    event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
-    event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
-    event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
+    InitMouseEvent( win, event, gdk_event );
  
  
-    event.m_x = (long)gdk_event->x;
-    event.m_y = (long)gdk_event->y;
+    AdjustEventButtonState(event);
+    
+    // wxListBox actually get mouse events from the item
+    
+    if (win->m_isListBox)
+    {
+        event.m_x += widget->allocation.x;
+        event.m_y += widget->allocation.y;
+    }
  
      // Some control don't have their own X window and thus cannot get
      // any events.
  
  
      // Some control don't have their own X window and thus cannot get
      // any events.
  
-    if (!g_capturing)
+    if (!g_captureWindow)
      {
      {
+        wxCoord x = event.m_x;
+        wxCoord y = event.m_y;
+        if (win->m_wxwindow)
+        {
+            GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow);
+            x += pizza->xoffset;
+            y += pizza->yoffset;
+        }
+
          wxNode *node = win->GetChildren().First();
          while (node)
          {
          wxNode *node = win->GetChildren().First();
          while (node)
          {
-            wxWindow *child = (wxWindow*)node->Data();
+            wxWindowGTK *child = (wxWindowGTK*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
-                int x = event.m_x;
-                int y = event.m_y;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
@@ -902,10 +1403,10 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
-                    (child->m_x <= event.m_x) &&
-                    (child->m_y <= event.m_y) &&
-                    (child->m_x+child->m_width  >= event.m_x) &&
-                    (child->m_y+child->m_height >= event.m_y))
+                    (child->m_x <= x) &&
+                    (child->m_y <= y) &&
+                    (child->m_x+child->m_width  >= x) &&
+                    (child->m_y+child->m_height >= y))
                  {
                      win = child;
                      event.m_x -= child->m_x;
                  {
                      win = child;
                      event.m_x -= child->m_x;
@@ -913,7 +1414,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                      break;
                  }
              }
                      break;
                  }
              }
-            node = node->Next();
          }
      }
  
          }
      }
  
@@ -921,6 +1421,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
  
      gs_timeLastClick = gdk_event->time;
  
  
      gs_timeLastClick = gdk_event->time;
  
+/*
+    wxPrintf( wxT("2) OnButtonPress from ") );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        wxPrintf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( wxT(".\n") );
+*/
+
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
          gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
          gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
@@ -934,9 +1441,11 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
  // "button_release_event"
  //-----------------------------------------------------------------------------
  
  // "button_release_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
+static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
@@ -959,35 +1468,48 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
          case 1: event_type = wxEVT_LEFT_UP; break;
          case 2: event_type = wxEVT_MIDDLE_UP; break;
          case 3: event_type = wxEVT_RIGHT_UP; break;
          case 1: event_type = wxEVT_LEFT_UP; break;
          case 2: event_type = wxEVT_MIDDLE_UP; break;
          case 3: event_type = wxEVT_RIGHT_UP; break;
+        default: return FALSE;
      }
  
      wxMouseEvent event( event_type );
      }
  
      wxMouseEvent event( event_type );
-    event.SetTimestamp( gdk_event->time );
-    event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
-    event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
-    event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
-    event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
-    event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
-    event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
-    event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
-    event.m_x = (long)gdk_event->x;
-    event.m_y = (long)gdk_event->y;
+    InitMouseEvent( win, event, gdk_event );
+
+    AdjustEventButtonState(event);
+
+    // wxListBox actually get mouse events from the item
+    
+    if (win->m_isListBox)
+    {
+        event.m_x += widget->allocation.x;
+        event.m_y += widget->allocation.y;
+    }
  
      // Some control don't have their own X window and thus cannot get
      // any events.
  
  
      // Some control don't have their own X window and thus cannot get
      // any events.
  
-    if (!g_capturing)
+    if (!g_captureWindow)
      {
      {
+        wxCoord x = event.m_x;
+        wxCoord y = event.m_y;
+        if (win->m_wxwindow)
+        {
+            GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow);
+            x += pizza->xoffset;
+            y += pizza->yoffset;
+        }
+
          wxNode *node = win->GetChildren().First();
          while (node)
          {
          wxNode *node = win->GetChildren().First();
          while (node)
          {
-            wxWindow *child = (wxWindow*)node->Data();
+            wxWindowGTK *child = (wxWindowGTK*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
-                int x = event.m_x;
-                int y = event.m_y;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
@@ -1012,10 +1534,10 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
-                    (child->m_x <= event.m_x) &&
-                    (child->m_y <= event.m_y) &&
-                    (child->m_x+child->m_width  >= event.m_x) &&
-                    (child->m_y+child->m_height >= event.m_y))
+                    (child->m_x <= x) &&
+                    (child->m_y <= y) &&
+                    (child->m_x+child->m_width  >= x) &&
+                    (child->m_y+child->m_height >= y))
                  {
                      win = child;
                      event.m_x -= child->m_x;
                  {
                      win = child;
                      event.m_x -= child->m_x;
@@ -1023,7 +1545,6 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
                      break;
                  }
              }
                      break;
                  }
              }
-            node = node->Next();
          }
      }
  
          }
      }
  
@@ -1042,9 +1563,13 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
  // "motion_notify_event"
  //-----------------------------------------------------------------------------
  
  // "motion_notify_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win )
+static gint gtk_window_motion_notify_callback( GtkWidget *widget,
+                                               GdkEventMotion *gdk_event,
+                                               wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
@@ -1055,13 +1580,12 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
  
      if (gdk_event->is_hint)
      {
  
      if (gdk_event->is_hint)
      {
-       int x = 0;
-       int y = 0;
-       GdkModifierType state;
-       gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
-       gdk_event->x = x;
-       gdk_event->y = y;
-       gdk_event->state = state;
+        int x = 0;
+        int y = 0;
+        GdkModifierType state;
+        gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+        gdk_event->x = x;
+        gdk_event->y = y;
      }
  
  /*
      }
  
  /*
@@ -1072,33 +1596,51 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
  */
  
      wxMouseEvent event( wxEVT_MOTION );
  */
  
      wxMouseEvent event( wxEVT_MOTION );
-    event.SetTimestamp( gdk_event->time );
-    event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK);
-    event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK);
-    event.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
-    event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
-    event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK);
-    event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
-    event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
+    InitMouseEvent(win, event, gdk_event);
  
  
-    event.m_x = (long)gdk_event->x;
-    event.m_y = (long)gdk_event->y;
+    if ( g_captureWindow )
+    {
+        // synthetize a mouse enter or leave event if needed
+        GdkWindow *winUnderMouse = gdk_window_at_pointer(NULL, NULL);
+        bool hasMouse = winUnderMouse == gdk_event->window;
+        if ( hasMouse != g_captureWindowHasMouse )
+        {
+            // the mouse changed window
+            g_captureWindowHasMouse = hasMouse;
+
+            wxMouseEvent event(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW
+                                                       : wxEVT_LEAVE_WINDOW);
+            InitMouseEvent(win, event, gdk_event);
+            event.SetEventObject(win);
+            win->GetEventHandler()->ProcessEvent(event);
+        }
+    }
+    else // no capture
+    {
+        // Some control don't have their own X window and thus cannot get
+        // any events.
  
  
-    // Some control don't have their own X window and thus cannot get
-    // any events.
+        wxCoord x = event.m_x;
+        wxCoord y = event.m_y;
+        if (win->m_wxwindow)
+        {
+            GtkPizza *pizza = GTK_PIZZA(win->m_wxwindow);
+            x += pizza->xoffset;
+            y += pizza->yoffset;
+        }
  
  
-    if (!g_capturing)
-    {
          wxNode *node = win->GetChildren().First();
          while (node)
          {
          wxNode *node = win->GetChildren().First();
          while (node)
          {
-            wxWindow *child = (wxWindow*)node->Data();
+            wxWindowGTK *child = (wxWindowGTK*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
  
              if (child->m_isStaticBox)
              {
                  // wxStaticBox is transparent in the box itself
-                int x = event.m_x;
-                int y = event.m_y;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
                  int xx1 = child->m_x;
                  int yy1 = child->m_y;
                  int xx2 = child->m_x + child->m_width;
@@ -1123,10 +1665,10 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
              else
              {
                  if ((child->m_wxwindow == (GtkWidget*) NULL) &&
-                    (child->m_x <= event.m_x) &&
-                    (child->m_y <= event.m_y) &&
-                    (child->m_x+child->m_width  >= event.m_x) &&
-                    (child->m_y+child->m_height >= event.m_y))
+                    (child->m_x <= x) &&
+                    (child->m_y <= y) &&
+                    (child->m_x+child->m_width  >= x) &&
+                    (child->m_y+child->m_height >= y))
                  {
                      win = child;
                      event.m_x -= child->m_x;
                  {
                      win = child;
                      event.m_x -= child->m_x;
@@ -1134,7 +1676,6 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
                      break;
                  }
              }
                      break;
                  }
              }
-            node = node->Next();
          }
      }
  
          }
      }
  
@@ -1153,49 +1694,91 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
  // "focus_in_event"
  //-----------------------------------------------------------------------------
  
  // "focus_in_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+static gint gtk_window_focus_in_callback( GtkWidget *widget,
+                                          GdkEvent *WXUNUSED(event),
+                                          wxWindow *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
+    switch ( g_sendActivateEvent )
+    {
+        case -1:
+            // we've got focus from outside, synthetize wxActivateEvent
+            g_sendActivateEvent = 1;
+            break;
+
+        case 0:
+            // another our window just lost focus, it was already ours before
+            // - don't send any wxActivateEvent
+            g_sendActivateEvent = -1;
+            break;
+    }
+
+    g_focusWindowLast =
      g_focusWindow = win;
  
      g_focusWindow = win;
  
-    if (win->m_wxwindow)
+#if 0
+    wxPrintf( "OnSetFocus from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        wxPrintf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( ".\n" );
+#endif
+
+    // notify the parent keeping track of focus for the kbd navigation
+    // purposes that we got it
+    wxChildFocusEvent eventFocus(win);
+    (void)win->GetEventHandler()->ProcessEvent(eventFocus);
+
+#ifdef HAVE_XIM
+    if (win->m_ic)
+        gdk_im_begin(win->m_ic, win->m_wxwindow->window);
+#endif
+
+#if wxUSE_CARET
+    // caret needs to be informed about focus change
+    wxCaret *caret = win->GetCaret();
+    if ( caret )
+    {
+        caret->OnSetFocus();
+    }
+#endif // wxUSE_CARET
+
+    wxWindowGTK *active = wxGetTopLevelParent(win);
+    if ( active != g_activeFrame )
      {
      {
-        if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
+        if ( g_activeFrame )
          {
          {
-            GTK_WIDGET_SET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS);
-/*
-            printf( "SetFocus flag from " );
-            if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-                printf( win->GetClassInfo()->GetClassName() );
-            printf( ".\n" );
-*/
+            wxLogTrace(wxT("activate"), wxT("Deactivating frame %p (from focus_in)"), g_activeFrame);
+            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
+            event.SetEventObject(g_activeFrame);
+            g_activeFrame->GetEventHandler()->ProcessEvent(event);
          }
          }
-    }
  
  
+        wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), active);
+        g_activeFrame = active;
+        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, g_activeFrame->GetId());
+        event.SetEventObject(g_activeFrame);
+        g_activeFrame->GetEventHandler()->ProcessEvent(event);
+    }
+    g_activeFrameLostFocus = FALSE;
  
  
-/*
-    printf( "OnSetFocus from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( "   " );
-    printf( WXSTRINGCAST win->GetLabel() );
-    printf( ".\n" );
-*/
  
      wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
      event.SetEventObject( win );
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
  
      wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() );
      event.SetEventObject( win );
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
-        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" );
-        return TRUE;
+       gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" );
+       return TRUE;
      }
  
      }
  
+
      return FALSE;
  }
  
      return FALSE;
  }
  
@@ -1203,26 +1786,74 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(
  // "focus_out_event"
  //-----------------------------------------------------------------------------
  
  // "focus_out_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+static GtkWidget *gs_widgetLastFocus = NULL;
+
+static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
-    if (win->m_wxwindow)
+    // VZ: this is really weird but GTK+ seems to call us from inside
+    //     gtk_widget_grab_focus(), i.e. it first sends "focus_out" signal to
+    //     this widget and then "focus_in". This is totally unexpected and
+    //     completely breaks wxUniv code so ignore this dummy event (we can't
+    //     be losing focus if we're about to acquire it!)
+    if ( widget == gs_widgetLastFocus )
      {
      {
-      if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
-          GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS);
+        gs_widgetLastFocus = NULL;
+
+        return FALSE;
      }
  
      }
  
-/*
-    printf( "OnKillFocus from " );
+    if ( !g_activeFrameLostFocus && g_activeFrame )
+    {
+        // VZ: commenting this out because it does happen (although not easy
+        //     to reproduce, I only see it when using wxMiniFrame and not
+        //     always) and makes using Mahogany quite annoying
+#if 0
+        wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
+                        wxT("unfocusing window that hasn't gained focus properly") )
+#endif // 0
+
+        g_activeFrameLostFocus = TRUE;
+    }
+
+    // if the focus goes out of our app alltogether, OnIdle() will send
+    // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
+    // g_sendActivateEvent to -1
+    g_sendActivateEvent = 0;
+
+    wxWindowGTK *winFocus = wxFindFocusedChild(win);
+    if ( winFocus )
+        win = winFocus;
+
+    g_focusWindow = (wxWindowGTK *)NULL;
+
+#if 0
+    wxPrintf( "OnKillFocus from " );
      if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
      if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+        wxPrintf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( ".\n" );
+#endif
+
+#ifdef HAVE_XIM
+    if (win->m_ic)
+        gdk_im_end();
+#endif
+
+#if wxUSE_CARET
+    // caret needs to be informed about focus change
+    wxCaret *caret = win->GetCaret();
+    if ( caret )
+    {
+        caret->OnKillFocus();
+    }
+#endif // wxUSE_CARET
  
      wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
      event.SetEventObject( win );
  
      wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
      event.SetEventObject( win );
@@ -1240,9 +1871,11 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED
  // "enter_notify_event"
  //-----------------------------------------------------------------------------
  
  // "enter_notify_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
+static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
@@ -1250,13 +1883,8 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_
  
      if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
  
  
      if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
  
-    if (widget->window && win->GetCursor().Ok() )
-        gdk_window_set_cursor( widget->window, win->GetCursor().GetCursor() );
-
      wxMouseEvent event( wxEVT_ENTER_WINDOW );
      wxMouseEvent event( wxEVT_ENTER_WINDOW );
-#if (GTK_MINOR_VERSION > 0)
      event.SetTimestamp( gdk_event->time );
      event.SetTimestamp( gdk_event->time );
-#endif
      event.SetEventObject( win );
  
      int x = 0;
      event.SetEventObject( win );
  
      int x = 0;
@@ -1265,16 +1893,10 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_
  
      gdk_window_get_pointer( widget->window, &x, &y, &state );
  
  
      gdk_window_get_pointer( widget->window, &x, &y, &state );
  
-    event.m_shiftDown = (state & GDK_SHIFT_MASK);
-    event.m_controlDown = (state & GDK_CONTROL_MASK);
-    event.m_altDown = (state & GDK_MOD1_MASK);
-    event.m_metaDown = (state & GDK_MOD2_MASK);
-    event.m_leftDown = (state & GDK_BUTTON1_MASK);
-    event.m_middleDown = (state & GDK_BUTTON2_MASK);
-    event.m_rightDown = (state & GDK_BUTTON3_MASK);
-
-    event.m_x = (long)x;
-    event.m_y = (long)y;
+    InitMouseEvent(win, event, gdk_event);
+    wxPoint pt = win->GetClientAreaOrigin();
+    event.m_x = x + pt.x;
+    event.m_y = y + pt.y;
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
@@ -1289,23 +1911,20 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_
  // "leave_notify_event"
  //-----------------------------------------------------------------------------
  
  // "leave_notify_event"
  //-----------------------------------------------------------------------------
  
-static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
+static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
      if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
          wxapp_install_idle_handler();
  
      if (!win->m_hasVMT) return FALSE;
      if (g_blockEventsOnDrag) return FALSE;
  
      if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
-    
-    if (widget->window && win->GetCursor().Ok() )
-        gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() );
  
      wxMouseEvent event( wxEVT_LEAVE_WINDOW );
  
      wxMouseEvent event( wxEVT_LEAVE_WINDOW );
-#if (GTK_MINOR_VERSION > 0)
      event.SetTimestamp( gdk_event->time );
      event.SetTimestamp( gdk_event->time );
-#endif
      event.SetEventObject( win );
  
      int x = 0;
      event.SetEventObject( win );
  
      int x = 0;
@@ -1322,8 +1941,9 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_
      event.m_middleDown = (state & GDK_BUTTON2_MASK);
      event.m_rightDown = (state & GDK_BUTTON3_MASK);
  
      event.m_middleDown = (state & GDK_BUTTON2_MASK);
      event.m_rightDown = (state & GDK_BUTTON3_MASK);
  
-    event.m_x = (long)x;
-    event.m_y = (long)y;
+    wxPoint pt = win->GetClientAreaOrigin();
+    event.m_x = x + pt.x;
+    event.m_y = y + pt.y;
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
  
      if (win->GetEventHandler()->ProcessEvent( event ))
      {
@@ -1338,40 +1958,32 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_
  // "value_changed" from m_vAdjust
  //-----------------------------------------------------------------------------
  
  // "value_changed" from m_vAdjust
  //-----------------------------------------------------------------------------
  
-static void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
+static void gtk_window_vscroll_callback( GtkAdjustment *adjust, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (g_blockEventsOnDrag) return;
  
      if (!win->m_hasVMT) return;
  
          wxapp_install_idle_handler();
  
      if (g_blockEventsOnDrag) return;
  
      if (!win->m_hasVMT) return;
  
-    float diff = win->m_vAdjust->value - win->m_oldVerticalPos;
+    float diff = adjust->value - win->m_oldVerticalPos;
      if (fabs(diff) < 0.2) return;
      if (fabs(diff) < 0.2) return;
-    win->m_oldVerticalPos = win->m_vAdjust->value;
  
  
-    wxEventType command = wxEVT_NULL;
+    win->m_oldVerticalPos = adjust->value;
  
  
-    float line_step = win->m_vAdjust->step_increment;
-    float page_step = win->m_vAdjust->page_increment;
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+    GtkRange *range = GTK_RANGE( scrolledWindow->vscrollbar );
  
  
-    if (win->IsScrolling())
-    {
-        command = wxEVT_SCROLLWIN_THUMBTRACK;
-    }
-    else
-    {
-        if (fabs(win->m_vAdjust->value-win->m_vAdjust->lower) < 0.2) command = wxEVT_SCROLLWIN_BOTTOM;
-        else if (fabs(win->m_vAdjust->value-win->m_vAdjust->upper) < 0.2) command = wxEVT_SCROLLWIN_TOP;
-        else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLLWIN_LINEDOWN;
-        else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLLWIN_LINEUP;
-        else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLLWIN_PAGEDOWN;
-        else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLLWIN_PAGEUP;
-        else command = wxEVT_SCROLLWIN_THUMBTRACK;
-    }
+    wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
+    if      (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP;
+    else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD)  command = wxEVT_SCROLLWIN_LINEDOWN;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLLWIN_PAGEDOWN;
  
  
-    int value = (int)(win->m_vAdjust->value+0.5);
+    int value = (int)(adjust->value+0.5);
  
      wxScrollWinEvent event( command, value, wxVERTICAL );
      event.SetEventObject( win );
  
      wxScrollWinEvent event( command, value, wxVERTICAL );
      event.SetEventObject( win );
@@ -1382,79 +1994,31 @@ static void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *
  // "value_changed" from m_hAdjust
  //-----------------------------------------------------------------------------
  
  // "value_changed" from m_hAdjust
  //-----------------------------------------------------------------------------
  
-static void gtk_window_hscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
+static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindowGTK *win )
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
      if (g_blockEventsOnDrag) return;
      if (!win->m_hasVMT) return;
  
          wxapp_install_idle_handler();
  
      if (g_blockEventsOnDrag) return;
      if (!win->m_hasVMT) return;
  
-    float diff = win->m_hAdjust->value - win->m_oldHorizontalPos;
+    float diff = adjust->value - win->m_oldHorizontalPos;
      if (fabs(diff) < 0.2) return;
      if (fabs(diff) < 0.2) return;
-    win->m_oldHorizontalPos = win->m_hAdjust->value;
-
-    wxEventType command = wxEVT_NULL;
-
-    float line_step = win->m_hAdjust->step_increment;
-    float page_step = win->m_hAdjust->page_increment;
-
-    if (win->IsScrolling())
-    {
-        command = wxEVT_SCROLLWIN_THUMBTRACK;
-    }
-    else
-    {
-        if (fabs(win->m_hAdjust->value-win->m_hAdjust->lower) < 0.2) command = wxEVT_SCROLLWIN_BOTTOM;
-        else if (fabs(win->m_hAdjust->value-win->m_hAdjust->upper) < 0.2) command = wxEVT_SCROLLWIN_TOP;
-        else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLLWIN_LINEDOWN;
-        else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLLWIN_LINEUP;
-        else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLLWIN_PAGEDOWN;
-        else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLLWIN_PAGEUP;
-        else command = wxEVT_SCROLLWIN_THUMBTRACK;
-    }
  
  
-    int value = (int)(win->m_hAdjust->value+0.5);
+    win->m_oldHorizontalPos = adjust->value;
  
  
-    wxScrollWinEvent event( command, value, wxHORIZONTAL );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-// "changed" from m_vAdjust
-//-----------------------------------------------------------------------------
-
-static void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
-    if (g_blockEventsOnDrag) return;
-    if (!win->m_hasVMT) return;
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+    GtkRange *range = GTK_RANGE( scrolledWindow->hscrollbar );
  
      wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
  
      wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
-    int value = (int)(win->m_vAdjust->value+0.5);
-
-    wxScrollWinEvent event( command, value, wxVERTICAL );
-    event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
-}
-
-//-----------------------------------------------------------------------------
-// "changed" from m_hAdjust
-//-----------------------------------------------------------------------------
-
-static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
-{
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
-
-    if (g_blockEventsOnDrag) return;
-    if (!win->m_hasVMT) return;
+    if      (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLLWIN_LINEUP;
+    else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD)  command = wxEVT_SCROLLWIN_LINEDOWN;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLLWIN_PAGEUP;
+    else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLLWIN_PAGEDOWN;
  
  
-    wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
-    int value = (int)(win->m_hAdjust->value+0.5);
+    int value = (int)(adjust->value+0.5);
  
      wxScrollWinEvent event( command, value, wxHORIZONTAL );
      event.SetEventObject( win );
  
      wxScrollWinEvent event( command, value, wxHORIZONTAL );
      event.SetEventObject( win );
@@ -1465,19 +2029,18 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW
  // "button_press_event" from scrollbar
  //-----------------------------------------------------------------------------
  
  // "button_press_event" from scrollbar
  //-----------------------------------------------------------------------------
  
-static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
-                                                 GdkEventButton *WXUNUSED(gdk_event),
-                                                 wxWindow *win )
+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
+                                                 GdkEventButton *gdk_event,
+                                                 wxWindowGTK *win)
  {
  {
-    if (g_isIdle) 
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
          wxapp_install_idle_handler();
  
          wxapp_install_idle_handler();
  
-//  don't test here as we can release the mouse while being over
-//  a different window then the slider
-//
-//    if (gdk_event->window != widget->slider) return FALSE;
  
  
-    win->SetScrolling( TRUE );
+    g_blockEventsOnScroll = TRUE;
+    win->m_isScrolling = (gdk_event->window == widget->slider);
  
      return FALSE;
  }
  
      return FALSE;
  }
@@ -1488,22 +2051,41 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
  
  static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
                                                     GdkEventButton *WXUNUSED(gdk_event),
  
  static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
                                                     GdkEventButton *WXUNUSED(gdk_event),
-                                                   wxWindow *win )
+                                                   wxWindowGTK *win)
  {
  {
+    DEBUG_MAIN_THREAD
  
  //  don't test here as we can release the mouse while being over
  
  //  don't test here as we can release the mouse while being over
-//  a different window then the slider
+//  a different window than the slider
  //
  //    if (gdk_event->window != widget->slider) return FALSE;
  
  //
  //    if (gdk_event->window != widget->slider) return FALSE;
  
-    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+    g_blockEventsOnScroll = FALSE;
  
  
-    if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
-        gtk_signal_emit_by_name( GTK_OBJECT(win->m_hAdjust), "value_changed" );
-    else
-        gtk_signal_emit_by_name( GTK_OBJECT(win->m_vAdjust), "value_changed" );
+    if (win->m_isScrolling)
+    {
+        wxEventType command = wxEVT_SCROLLWIN_THUMBRELEASE;
+        int value = -1;
+        int dir = -1;
+
+        GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+        if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
+        {
+            value = (int)(win->m_hAdjust->value+0.5);
+            dir = wxHORIZONTAL;
+        }
+        if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
+        {
+            value = (int)(win->m_vAdjust->value+0.5);
+            dir = wxVERTICAL;
+        }
+
+        wxScrollWinEvent event( command, value, dir );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
  
  
-    win->SetScrolling( FALSE );
+    win->m_isScrolling = FALSE;
  
      return FALSE;
  }
  
      return FALSE;
  }
@@ -1515,24 +2097,24 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
  
  wxWindow *wxWindowBase::FindFocus()
  {
  
  wxWindow *wxWindowBase::FindFocus()
  {
-    return g_focusWindow;
+    // the cast is necessary when we compile in wxUniversal mode
+    return (wxWindow *)g_focusWindow;
  }
  
  //-----------------------------------------------------------------------------
  // "realize" from m_widget
  //-----------------------------------------------------------------------------
  
  }
  
  //-----------------------------------------------------------------------------
  // "realize" from m_widget
  //-----------------------------------------------------------------------------
  
-/* we cannot set colours, fonts and cursors before the widget has
-   been realized, so we do this directly after realization */
+/* We cannot set colours and fonts before the widget has
+   been realized, so we do this directly after realization. */
  
  static gint
  
  static gint
-gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
+gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
  {
  {
-    if (g_isIdle) 
-        wxapp_install_idle_handler();
+    DEBUG_MAIN_THREAD
  
  
-    if (win->m_delayedFont)
-        win->SetFont( win->GetFont() );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
  
      if (win->m_delayedBackgroundColour)
          win->SetBackgroundColour( win->GetBackgroundColour() );
  
      if (win->m_delayedBackgroundColour)
          win->SetBackgroundColour( win->GetBackgroundColour() );
@@ -1540,8 +2122,6 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
      if (win->m_delayedForegroundColour)
          win->SetForegroundColour( win->GetForegroundColour() );
  
      if (win->m_delayedForegroundColour)
          win->SetForegroundColour( win->GetForegroundColour() );
  
-    win->SetCursor( win->GetCursor() );
-    
      wxWindowCreateEvent event( win );
      event.SetEventObject( win );
      win->GetEventHandler()->ProcessEvent( event );
      wxWindowCreateEvent event( win );
      event.SetEventObject( win );
      win->GetEventHandler()->ProcessEvent( event );
@@ -1550,49 +2130,212 @@ gtk_window_realized_callback( GtkWidget * WXUNUSED(widget), wxWindow *win )
  }
  
  //-----------------------------------------------------------------------------
  }
  
  //-----------------------------------------------------------------------------
-// InsertChild for wxWindow.
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+static
+void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
+                               GtkAllocation *WXUNUSED(alloc),
+                               wxWindow *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasScrolling) return;
+
+    int client_width = 0;
+    int client_height = 0;
+    win->GetClientSize( &client_width, &client_height );
+    if ((client_width == win->m_oldClientWidth) && (client_height == win->m_oldClientHeight))
+        return;
+
+    win->m_oldClientWidth = client_width;
+    win->m_oldClientHeight = client_height;
+
+    if (!win->m_nativeSizeEvent)
+    {
+        wxSizeEvent event( win->GetSize(), win->GetId() );
+        event.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event );
+    }
+}
+
+
+#ifdef HAVE_XIM
+    #define WXUNUSED_UNLESS_XIM(param)  param
+#else
+    #define WXUNUSED_UNLESS_XIM(param)  WXUNUSED(param)
+#endif
+
+/* Resize XIM window */
+
+static
+void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget),
+                                 GtkAllocation* WXUNUSED_UNLESS_XIM(alloc),
+                                 wxWindowGTK* WXUNUSED_UNLESS_XIM(win) )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+#ifdef HAVE_XIM
+    if (!win->m_ic)
+        return;
+
+    if  (gdk_ic_get_style (win->m_ic) & GDK_IM_PREEDIT_POSITION)
+    {
+        gint width, height;
+
+        gdk_window_get_size (widget->window, &width, &height);
+        win->m_icattr->preedit_area.width = width;
+        win->m_icattr->preedit_area.height = height;
+        gdk_ic_set_attr (win->m_ic, win->m_icattr, GDK_IC_PREEDIT_AREA);
+    }
+#endif // HAVE_XIM
+}
+
+//-----------------------------------------------------------------------------
+// "realize" from m_wxwindow
+//-----------------------------------------------------------------------------
+
+/* Initialize XIM support */
+
+static gint
+gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
+                                wxWindowGTK * WXUNUSED_UNLESS_XIM(win) )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+#ifdef HAVE_XIM
+    if (win->m_ic) return FALSE;
+    if (!widget) return FALSE;
+    if (!gdk_im_ready()) return FALSE;
+
+    win->m_icattr = gdk_ic_attr_new();
+    if (!win->m_icattr) return FALSE;
+
+    gint width, height;
+    GdkEventMask mask;
+    GdkColormap *colormap;
+    GdkICAttr *attr = win->m_icattr;
+    unsigned attrmask = GDK_IC_ALL_REQ;
+    GdkIMStyle style;
+    GdkIMStyle supported_style = (GdkIMStyle)
+                                  (GDK_IM_PREEDIT_NONE |
+                                   GDK_IM_PREEDIT_NOTHING |
+                                   GDK_IM_PREEDIT_POSITION |
+                                   GDK_IM_STATUS_NONE |
+                                   GDK_IM_STATUS_NOTHING);
+
+    if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
+        supported_style = (GdkIMStyle)(supported_style & ~GDK_IM_PREEDIT_POSITION);
+
+    attr->style = style = gdk_im_decide_style (supported_style);
+    attr->client_window = widget->window;
+
+    if ((colormap = gtk_widget_get_colormap (widget)) !=
+            gtk_widget_get_default_colormap ())
+    {
+        attrmask |= GDK_IC_PREEDIT_COLORMAP;
+        attr->preedit_colormap = colormap;
+    }
+
+    attrmask |= GDK_IC_PREEDIT_FOREGROUND;
+    attrmask |= GDK_IC_PREEDIT_BACKGROUND;
+    attr->preedit_foreground = widget->style->fg[GTK_STATE_NORMAL];
+    attr->preedit_background = widget->style->base[GTK_STATE_NORMAL];
+
+    switch (style & GDK_IM_PREEDIT_MASK)
+    {
+        case GDK_IM_PREEDIT_POSITION:
+            if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
+            {
+                g_warning ("over-the-spot style requires fontset");
+                break;
+            }
+
+            gdk_window_get_size (widget->window, &width, &height);
+
+            attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
+            attr->spot_location.x = 0;
+            attr->spot_location.y = height;
+            attr->preedit_area.x = 0;
+            attr->preedit_area.y = 0;
+            attr->preedit_area.width = width;
+            attr->preedit_area.height = height;
+            attr->preedit_fontset = widget->style->font;
+
+            break;
+    }
+
+      win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
+
+      if (win->m_ic == NULL)
+          g_warning ("Can't create input context.");
+      else
+      {
+          mask = gdk_window_get_events (widget->window);
+          mask = (GdkEventMask)(mask | gdk_ic_get_events (win->m_ic));
+          gdk_window_set_events (widget->window, mask);
+
+          if (GTK_WIDGET_HAS_FOCUS(widget))
+              gdk_im_begin (win->m_ic, widget->window);
+      }
+#endif // HAVE_XIM
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// InsertChild for wxWindowGTK.
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-/* Callback for wxWindow. This very strange beast has to be used because
+/* Callback for wxWindowGTK. This very strange beast has to be used because
   * C++ has no virtual methods in a constructor. We have to emulate a
   * virtual function here as wxNotebook requires a different way to insert
   * a child in it. I had opted for creating a wxNotebookPage window class
   * which would have made this superfluous (such in the MDI window system),
   * but no-one was listening to me... */
  
   * C++ has no virtual methods in a constructor. We have to emulate a
   * virtual function here as wxNotebook requires a different way to insert
   * a child in it. I had opted for creating a wxNotebookPage window class
   * which would have made this superfluous (such in the MDI window system),
   * but no-one was listening to me... */
  
-static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
+static void wxInsertChildInWindow( wxWindowGTK* parent, wxWindowGTK* child )
  {
  {
-    gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+    /* the window might have been scrolled already, do we
+       have to adapt the position */
+    GtkPizza *pizza = GTK_PIZZA(parent->m_wxwindow);
+    child->m_x += pizza->xoffset;
+    child->m_y += pizza->yoffset;
+
+    gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
                       GTK_WIDGET(child->m_widget),
                       child->m_x,
                       child->m_y,
                       child->m_width,
                       child->m_height );
                       GTK_WIDGET(child->m_widget),
                       child->m_x,
                       child->m_y,
                       child->m_width,
                       child->m_height );
-
-    if (parent->HasFlag(wxTAB_TRAVERSAL))
-    {
-        /* we now allow a window to get the focus as long as it
-           doesn't have any children. */
-        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
-    }
  }
  
  //-----------------------------------------------------------------------------
  // global functions
  //-----------------------------------------------------------------------------
  
  }
  
  //-----------------------------------------------------------------------------
  // global functions
  //-----------------------------------------------------------------------------
  
-wxWindow* wxGetActiveWindow()
+wxWindow *wxGetActiveWindow()
  {
  {
-    return g_focusWindow;
+    // the cast is necessary when we compile in wxUniversal mode
+    return (wxWindow *)g_focusWindow;
  }
  
  //-----------------------------------------------------------------------------
  }
  
  //-----------------------------------------------------------------------------
-// wxWindow
+// wxWindowGTK
  //-----------------------------------------------------------------------------
  
  //-----------------------------------------------------------------------------
  
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
+// method
+#ifdef __WXUNIVERSAL__
+    IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
+#else // __WXGTK__
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXGTK__
  
  
-void wxWindow::Init()
+void wxWindowGTK::Init()
  {
      // common init
      InitBase();
  {
      // common init
      InitBase();
@@ -1600,6 +2343,7 @@ void wxWindow::Init()
      // GTK specific
      m_widget = (GtkWidget *) NULL;
      m_wxwindow = (GtkWidget *) NULL;
      // GTK specific
      m_widget = (GtkWidget *) NULL;
      m_wxwindow = (GtkWidget *) NULL;
+    m_focusWidget = (GtkWidget *) NULL;
  
      // position/size
      m_x = 0;
  
      // position/size
      m_x = 0;
@@ -1612,6 +2356,9 @@ void wxWindow::Init()
      m_needParent = TRUE;
      m_isBeingDeleted = FALSE;
  
      m_needParent = TRUE;
      m_isBeingDeleted = FALSE;
  
+    m_noExpose = FALSE;
+    m_nativeSizeEvent = FALSE;
+    
      m_hasScrolling = FALSE;
      m_isScrolling = FALSE;
  
      m_hasScrolling = FALSE;
      m_isScrolling = FALSE;
  
@@ -1621,50 +2368,68 @@ void wxWindow::Init()
      m_oldVerticalPos = 0.0;
  
      m_resizing = FALSE;
      m_oldVerticalPos = 0.0;
  
      m_resizing = FALSE;
-    m_scrollGC = (GdkGC*) NULL;
      m_widgetStyle = (GtkStyle*) NULL;
  
      m_widgetStyle = (GtkStyle*) NULL;
  
-    m_insertCallback = wxInsertChildInWindow;
+    m_insertCallback = (wxInsertChildFunction) NULL;
  
      m_isStaticBox = FALSE;
  
      m_isStaticBox = FALSE;
+    m_isRadioButton = FALSE;
+    m_isListBox = FALSE;
+    m_isFrame = FALSE;
      m_acceptsFocus = FALSE;
      m_acceptsFocus = FALSE;
+
+    m_clipPaintRegion = FALSE;
+
+    m_cursor = *wxSTANDARD_CURSOR;
+
+    m_delayedForegroundColour = FALSE;
+    m_delayedBackgroundColour = FALSE;
+
+#ifdef HAVE_XIM
+    m_ic = (GdkIC*) NULL;
+    m_icattr = (GdkICAttr*) NULL;
+#endif
  }
  
  }
  
-wxWindow::wxWindow()
+wxWindowGTK::wxWindowGTK()
  {
      Init();
  }
  
  {
      Init();
  }
  
-wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
-                    const wxPoint &pos, const wxSize &size,
-                    long style, const wxString &name  )
+wxWindowGTK::wxWindowGTK( wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint &pos,
+                          const wxSize &size,
+                          long style,
+                          const wxString &name  )
  {
      Init();
  
      Create( parent, id, pos, size, style, name );
  }
  
  {
      Init();
  
      Create( parent, id, pos, size, style, name );
  }
  
-bool wxWindow::Create( wxWindow *parent, wxWindowID id,
-                       const wxPoint &pos, const wxSize &size,
-                       long style, const wxString &name  )
+bool wxWindowGTK::Create( wxWindow *parent,
+                          wxWindowID id,
+                          const wxPoint &pos,
+                          const wxSize &size,
+                          long style,
+                          const wxString &name  )
  {
  {
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxWindowGTK creation failed") );
+        return FALSE;
+    }
+
+    m_insertCallback = wxInsertChildInWindow;
  
      m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
      GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
  
  
      m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
      GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
  
-#ifdef __WXDEBUG__
-    debug_focus_in( m_widget, _T("wxWindow::m_widget"), name );
-#endif
-
      GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
  
      GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
  
-#ifdef __WXDEBUG__
-    debug_focus_in( scrolledWindow->hscrollbar, _T("wxWindow::hsrcollbar"), name );
-    debug_focus_in( scrolledWindow->vscrollbar, _T("wxWindow::vsrcollbar"), name );
-#endif
-
-    GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+    GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
      scroll_class->scrollbar_spacing = 0;
  
      gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
      scroll_class->scrollbar_spacing = 0;
  
      gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
@@ -1672,28 +2437,29 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
      m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->hscrollbar) );
      m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->vscrollbar) );
  
      m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->hscrollbar) );
      m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->vscrollbar) );
  
-    m_wxwindow = gtk_myfixed_new();
-
-#ifdef __WXDEBUG__
-    debug_focus_in( m_wxwindow, _T("wxWindow::m_wxwindow"), name );
-#endif
+    m_wxwindow = gtk_pizza_new();
  
      gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
  
  
      gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
  
+#ifndef __WXUNIVERSAL__
  #if (GTK_MINOR_VERSION > 0)
  #if (GTK_MINOR_VERSION > 0)
-    GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow);
+    GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
  
      if (HasFlag(wxRAISED_BORDER))
      {
  
      if (HasFlag(wxRAISED_BORDER))
      {
-        gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_OUT );
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_OUT );
      }
      else if (HasFlag(wxSUNKEN_BORDER))
      {
      }
      else if (HasFlag(wxSUNKEN_BORDER))
      {
-        gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_IN );
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_IN );
+    }
+    else if (HasFlag(wxSIMPLE_BORDER))
+    {
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_THIN );
      }
      else
      {
      }
      else
      {
-        gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_NONE );
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_NONE );
      }
  #else // GTK_MINOR_VERSION == 0
      GtkViewport *viewport = GTK_VIEWPORT(scrolledWindow->viewport);
      }
  #else // GTK_MINOR_VERSION == 0
      GtkViewport *viewport = GTK_VIEWPORT(scrolledWindow->viewport);
@@ -1711,19 +2477,10 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
          gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
      }
  #endif // GTK_MINOR_VERSION
          gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
      }
  #endif // GTK_MINOR_VERSION
+#endif // __WXUNIVERSAL__
  
  
-    if (HasFlag(wxTAB_TRAVERSAL))
-    {
-        /* we now allow a window to get the focus as long as it
-           doesn't have any children. */
-        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-        m_acceptsFocus = FALSE;
-    }
-    else
-    {
-        GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-        m_acceptsFocus = TRUE;
-    }
+    GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    m_acceptsFocus = TRUE;
  
  #if (GTK_MINOR_VERSION == 0)
      // shut the viewport up
  
  #if (GTK_MINOR_VERSION == 0)
      // shut the viewport up
@@ -1772,15 +2529,12 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
      gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
            (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
  
      gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
            (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
  
-    gtk_signal_connect( GTK_OBJECT(m_hAdjust), "changed",
-          (GtkSignalFunc) gtk_window_hscroll_change_callback, (gpointer) this );
-    gtk_signal_connect(GTK_OBJECT(m_vAdjust), "changed",
-          (GtkSignalFunc) gtk_window_vscroll_change_callback, (gpointer) this );
-
      gtk_widget_show( m_wxwindow );
  
      if (m_parent)
          m_parent->DoAddChild( this );
      gtk_widget_show( m_wxwindow );
  
      if (m_parent)
          m_parent->DoAddChild( this );
+        
+    m_focusWidget = m_wxwindow;
  
      PostCreation();
  
  
      PostCreation();
  
@@ -1789,8 +2543,14 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
      return TRUE;
  }
  
      return TRUE;
  }
  
-wxWindow::~wxWindow()
+wxWindowGTK::~wxWindowGTK()
  {
  {
+    if (g_focusWindow == this)
+        g_focusWindow = NULL;
+
+    if (g_activeFrame == this)
+        g_activeFrame = NULL;
+
      m_isBeingDeleted = TRUE;
      m_hasVMT = FALSE;
  
      m_isBeingDeleted = TRUE;
      m_hasVMT = FALSE;
  
@@ -1802,52 +2562,52 @@ wxWindow::~wxWindow()
      if (m_parent)
          m_parent->RemoveChild( this );
  
      if (m_parent)
          m_parent->RemoveChild( this );
  
-    if (m_widgetStyle)
-    {
-        gtk_style_unref( m_widgetStyle );
-       m_widgetStyle = (GtkStyle*) NULL;
-    }
+#ifdef HAVE_XIM
+    if (m_ic)
+        gdk_ic_destroy (m_ic);
+    if (m_icattr)
+        gdk_ic_attr_destroy (m_icattr);
+#endif
  
  
-    if (m_scrollGC)
+    if (m_widgetStyle)
      {
      {
-        gdk_gc_unref( m_scrollGC );
-       m_scrollGC = (GdkGC*) NULL;
+#if DISABLE_STYLE_IF_BROKEN_THEME
+        // don't delete if it's a pixmap theme style
+        if (!m_widgetStyle->engine_data)
+            gtk_style_unref( m_widgetStyle );
+#endif
+        m_widgetStyle = (GtkStyle*) NULL;
      }
  
      if (m_wxwindow)
      {
          gtk_widget_destroy( m_wxwindow );
      }
  
      if (m_wxwindow)
      {
          gtk_widget_destroy( m_wxwindow );
-       m_wxwindow = (GtkWidget*) NULL;
+        m_wxwindow = (GtkWidget*) NULL;
      }
  
      if (m_widget)
      {
          gtk_widget_destroy( m_widget );
      }
  
      if (m_widget)
      {
          gtk_widget_destroy( m_widget );
-       m_widget = (GtkWidget*) NULL;
+        m_widget = (GtkWidget*) NULL;
      }
  }
  
      }
  }
  
-void wxWindow::PreCreation( wxWindow *parent,
-                            wxWindowID id,
-                            const wxPoint &pos,
-                            const wxSize &size,
-                            long style,
-                            const wxString &name )
+bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos,  const wxSize &size )
  {
  {
-    wxASSERT_MSG( !m_needParent || parent, _T("Need complete parent.") );
-
-    if ( !CreateBase(parent, id, pos, size, style, name) )
-    {
-        wxFAIL_MSG(_T("window creation failed"));
-    }
+    wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") );
  
  
+    /* this turns -1 into 20 so that a minimal window is
+       visible even although -1,-1 has been given as the
+       size of the window. the same trick is used in other
+       ports and should make debugging easier */
      m_width = WidthDefault(size.x);
      m_height = HeightDefault(size.y);
  
      m_x = (int)pos.x;
      m_y = (int)pos.y;
  
      m_width = WidthDefault(size.x);
      m_height = HeightDefault(size.y);
  
      m_x = (int)pos.x;
      m_y = (int)pos.y;
  
-    if (!parent)  /* some reasonable defaults */
+    /* some reasonable defaults */
+    if (!parent)
      {
          if (m_x == -1)
          {
      {
          if (m_x == -1)
          {
@@ -1860,44 +2620,101 @@ void wxWindow::PreCreation( wxWindow *parent,
              if (m_y < 10) m_y = 10;
          }
      }
              if (m_y < 10) m_y = 10;
          }
      }
+
+    return TRUE;
  }
  
  }
  
-void wxWindow::PostCreation()
+void wxWindowGTK::PostCreation()
  {
  {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid window") );
-
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+    
      if (m_wxwindow)
      {
      if (m_wxwindow)
      {
-        /* these get reported to wxWindows -> wxPaintEvent */
-        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
-          GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+        if (!m_noExpose)
+        {
+            // these get reported to wxWindows -> wxPaintEvent
  
  
-        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
-          GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+            gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
  
  
-#if (GTK_MINOR_VERSION > 0)
-        /* these are called when the "sunken" or "raised" borders are drawn */
+            gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
+                GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+
+            gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
+                GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+
+            if (HasFlag(wxNO_FULL_REPAINT_ON_RESIZE))
+            {
+                gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
+                    GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
+            }
+        }
+
+        // these are called when the "sunken" or "raised" borders are drawn */
          gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
            GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
  
          gtk_signal_connect( GTK_OBJECT(m_widget), "draw",
            GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
          gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
            GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
  
          gtk_signal_connect( GTK_OBJECT(m_widget), "draw",
            GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
-#endif
      }
  
      }
  
+    // focus handling
+
+    if (m_focusWidget == NULL)
+        m_focusWidget = m_widget;
+
+#if 0
+    if (GetClassInfo() && GetClassInfo()->GetClassName())
+        wxPrintf( GetClassInfo()->GetClassName() );
+    wxPrintf( ".\n" );
+#endif
+
+    gtk_signal_connect( GTK_OBJECT(m_focusWidget), "focus_in_event",
+        GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(m_focusWidget), "focus_out_event",
+         GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+
+    // connect to the various key and mouse handlers
+
      GtkWidget *connect_widget = GetConnectWidget();
  
      ConnectWidget( connect_widget );
  
      GtkWidget *connect_widget = GetConnectWidget();
  
      ConnectWidget( connect_widget );
  
-   /*  we cannot set colours, fonts and cursors before the widget has
+    /* We cannot set colours, fonts and cursors before the widget has
         been realized, so we do this directly after realization */
      gtk_signal_connect( GTK_OBJECT(connect_widget), "realize",
         been realized, so we do this directly after realization */
      gtk_signal_connect( GTK_OBJECT(connect_widget), "realize",
-                           GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this );
+                            GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this );
+
+    if (m_wxwindow)
+    {
+        // Catch native resize events
+        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
+                            GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this );
+
+        // Initialize XIM support
+        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
+                            GTK_SIGNAL_FUNC(gtk_wxwindow_realized_callback), (gpointer) this );
+
+        // And resize XIM window
+        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
+                            GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this );
+    }
+
+    if (!GTK_IS_COMBO(m_widget))
+    {
+        // This is needed if we want to add our windows into native
+        // GTK control, such as the toolbar. With this callback, the
+        // toolbar gets to know the correct size (the one set by the
+        // programmer). Sadly, it misbehaves for wxComboBox. FIXME
+        // when moving to GTK 2.0.
+        gtk_signal_connect( GTK_OBJECT(m_widget), "size_request",
+                            GTK_SIGNAL_FUNC(gtk_window_size_request_callback), (gpointer) this );
+    }
  
      m_hasVMT = TRUE;
  }
  
  
      m_hasVMT = TRUE;
  }
  
-void wxWindow::ConnectWidget( GtkWidget *widget )
+void wxWindowGTK::ConnectWidget( GtkWidget *widget )
  {
      gtk_signal_connect( GTK_OBJECT(widget), "key_press_event",
        GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
  {
      gtk_signal_connect( GTK_OBJECT(widget), "key_press_event",
        GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
@@ -1914,12 +2731,6 @@ void wxWindow::ConnectWidget( GtkWidget *widget )
      gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
        GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
  
      gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
        GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
  
-    gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
-      GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
-
-    gtk_signal_connect( GTK_OBJECT(widget), "focus_out_event",
-      GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
-
      gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
        GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
  
      gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
        GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
  
@@ -1927,23 +2738,40 @@ void wxWindow::ConnectWidget( GtkWidget *widget )
        GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
  }
  
        GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
  }
  
-bool wxWindow::Destroy()
+bool wxWindowGTK::Destroy()
  {
  {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid window") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
  
      m_hasVMT = FALSE;
  
      return wxWindowBase::Destroy();
  }
  
  
      m_hasVMT = FALSE;
  
      return wxWindowBase::Destroy();
  }
  
-void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
+{
+    gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), m_widget, x, y, width, height );
+}
+
+void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
  {
  {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid window") );
-    wxASSERT_MSG( (m_parent != NULL), _T("wxWindow::SetSize requires parent.\n") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+    wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
+
+/*
+    printf( "DoSetSize: name %s, x,y,w,h: %d,%d,%d,%d \n", GetName().c_str(), x,y,width,height );
+*/
  
      if (m_resizing) return; /* I don't like recursions */
      m_resizing = TRUE;
  
  
      if (m_resizing) return; /* I don't like recursions */
      m_resizing = TRUE;
  
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    if (x == -1)
+        x = currentX;
+    if (y == -1)
+        y = currentY;
+    AdjustForParentClientOrigin(x, y, sizeFlags);
+
      if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
      {
          /* don't set the size for children of wxNotebook, just take the values. */
      if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
      {
          /* don't set the size for children of wxNotebook, just take the values. */
@@ -1954,17 +2782,19 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
      }
      else
      {
      }
      else
      {
-        if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+        GtkPizza *pizza = GTK_PIZZA(m_parent->m_wxwindow);
+
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
          {
          {
-            if (x != -1) m_x = x;
-            if (y != -1) m_y = y;
+            if (x != -1) m_x = x + pizza->xoffset;
+            if (y != -1) m_y = y + pizza->yoffset;
              if (width != -1) m_width = width;
              if (height != -1) m_height = height;
          }
          else
          {
              if (width != -1) m_width = width;
              if (height != -1) m_height = height;
          }
          else
          {
-            m_x = x;
-            m_y = y;
+            m_x = x + pizza->xoffset;
+            m_y = y + pizza->yoffset;
              m_width = width;
              m_height = height;
          }
              m_width = width;
              m_height = height;
          }
@@ -1985,67 +2815,122 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
          if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
  
          int border = 0;
          if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
  
          int border = 0;
+        int bottom_border = 0;
  
          if (GTK_WIDGET_CAN_DEFAULT(m_widget))
  
          if (GTK_WIDGET_CAN_DEFAULT(m_widget))
-       {
-           /* the default button has a border around it */
-           border = 5;
-       }
-
-       /* this is the result of hours of debugging: the following code
-          means that if we have a m_wxwindow and we set the size of
-          m_widget, m_widget (which is a GtkScrolledWindow) does NOT
-          automatically propagate its size down to its m_wxwindow,
-          which is its client area. therefore, we have to tell the
-          client area directly that it has to resize itself.
-          this will lead to that m_widget (GtkScrolledWindow) will
-          calculate how much size it needs for scrollbars etc and
-          it will then call XXX_size_allocate of its child, which
-          is m_wxwindow. m_wxwindow in turn will do the same with its
-          children and so on. problems can arise if this happens
-          before all the children have been realized as some widgets
-          stupidy need to be realized during XXX_size_allocate (e.g.
-          GtkNotebook) and they will segv if called otherwise. this
-          emergency is tested in gtk_myfixed_size_allocate. Normally
-          this shouldn't be needed and only gtk_widget_queue_resize()
-          should be enough to provoke a resize at the next appropriate
-          moment, but this seems to fail, e.g. when a wxNotebook contains
-          a wxSplitterWindow: the splitter window's children won't
-          show up properly resized then. */
-          
-        gtk_myfixed_set_size( GTK_MYFIXED(m_parent->m_wxwindow), 
-                             m_widget, 
-                             m_x-border, 
-                             m_y-border,
-                             m_width+2*border, 
-                             m_height+2*border );
-    }
-
-    m_sizeSet = TRUE;
-
-    wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
+        {
+            /* the default button has a border around it */
+            border = 6;
+            bottom_border = 5;
+        }
+
+        DoMoveWindow( m_x-border,
+                      m_y-border,
+                      m_width+2*border,
+                      m_height+border+bottom_border );
+    }
+
+    if (m_hasScrolling)
+    {
+        /* Sometimes the client area changes size without the
+           whole windows's size changing, but if the whole
+           windows's size doesn't change, no wxSizeEvent will
+           normally be sent. Here we add an extra test if
+           the client test has been changed and this will
+           be used then. */
+        GetClientSize( &m_oldClientWidth, &m_oldClientHeight );
+    }
+
+/*
+    wxPrintf( "OnSize sent from " );
+    if (GetClassInfo() && GetClassInfo()->GetClassName())
+        wxPrintf( GetClassInfo()->GetClassName() );
+    wxPrintf( " %d %d %d %d\n", (int)m_x, (int)m_y, (int)m_width, (int)m_height );
+*/
+
+    if (!m_nativeSizeEvent)
+    {
+        wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }
  
      m_resizing = FALSE;
  }
  
  
      m_resizing = FALSE;
  }
  
-void wxWindow::OnInternalIdle()
-{
+void wxWindowGTK::OnInternalIdle()
+{
+    if ( g_sendActivateEvent != -1 )
+    {
+        bool activate = g_sendActivateEvent != 0;
+
+        // do it only once
+        g_sendActivateEvent = -1;
+
+        wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast);
+    }
+
+    if ( g_activeFrameLostFocus )
+    {
+        if ( g_activeFrame )
+        {
+            wxLogTrace(wxT("activate"), wxT("Deactivating frame %p (from idle)"), g_activeFrame);
+            wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
+            event.SetEventObject(g_activeFrame);
+            g_activeFrame->GetEventHandler()->ProcessEvent(event);
+            g_activeFrame = NULL;
+        }
+        g_activeFrameLostFocus = FALSE;
+    }
+
+    wxCursor cursor = m_cursor;
+    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+
+    if (cursor.Ok())
+    {
+        /* I now set the cursor anew in every OnInternalIdle call
+           as setting the cursor in a parent window also effects the
+           windows above so that checking for the current cursor is
+           not possible. */
+
+        if (m_wxwindow)
+        {
+            GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
+            if (window)
+                gdk_window_set_cursor( window, cursor.GetCursor() );
+
+            if (!g_globalCursor.Ok())
+                cursor = *wxSTANDARD_CURSOR;
+
+            window = m_widget->window;
+            if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
+                gdk_window_set_cursor( window, cursor.GetCursor() );
+
+        }
+        else
+        {
+
+            GdkWindow *window = m_widget->window;
+            if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
+               gdk_window_set_cursor( window, cursor.GetCursor() );
+
+        }
+    }
+
      UpdateWindowUI();
  }
  
      UpdateWindowUI();
  }
  
-void wxWindow::DoGetSize( int *width, int *height ) const
+void wxWindowGTK::DoGetSize( int *width, int *height ) const
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (width) (*width) = m_width;
      if (height) (*height) = m_height;
  }
  
  
      if (width) (*width) = m_width;
      if (height) (*height) = m_height;
  }
  
-void wxWindow::DoSetClientSize( int width, int height )
+void wxWindowGTK::DoSetClientSize( int width, int height )
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_wxwindow)
      {
  
      if (!m_wxwindow)
      {
@@ -2056,59 +2941,59 @@ void wxWindow::DoSetClientSize( int width, int height )
          int dw = 0;
          int dh = 0;
  
          int dw = 0;
          int dh = 0;
  
-        if (!m_hasScrolling)
+#ifndef __WXUNIVERSAL__
+        if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
          {
          {
-            GtkStyleClass *window_class = m_wxwindow->style->klass;
-
-            if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
-            {
-                dw += 2 * window_class->xthickness;
-                dh += 2 * window_class->ythickness;
-            }
+            /* when using GTK 1.2 we set the shadow border size to 2 */
+            dw += 2 * 2;
+            dh += 2 * 2;
          }
          }
-        else
+        if (HasFlag(wxSIMPLE_BORDER))
          {
          {
-            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+            /* when using GTK 1.2 we set the simple border size to 1 */
+            dw += 1 * 2;
+            dh += 1 * 2;
+        }
+#endif // __WXUNIVERSAL__
  
  
-#if (GTK_MINOR_VERSION == 0)
-            GtkWidget *viewport = scroll_window->viewport;
-            GtkStyleClass *viewport_class = viewport->style->klass;
+        if (m_hasScrolling)
+        {
+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
  
  
-            if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
-            {
-                dw += 2 * viewport_class->xthickness;
-                dh += 2 * viewport_class->ythickness;
-            }
-#endif
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
  
  
-/*
-            GtkWidget *hscrollbar = scroll_window->hscrollbar;
-            GtkWidget *vscrollbar = scroll_window->vscrollbar;
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
  
  
-            we use this instead:  range.slider_width = 11 + 2*2pts edge
-*/
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
  
              if (scroll_window->vscrollbar_visible)
              {
  
              if (scroll_window->vscrollbar_visible)
              {
-                dw += 15;   /* dw += vscrollbar->allocation.width; */
+                dw += vscroll_req.width;
                  dw += scroll_class->scrollbar_spacing;
              }
  
              if (scroll_window->hscrollbar_visible)
              {
                  dw += scroll_class->scrollbar_spacing;
              }
  
              if (scroll_window->hscrollbar_visible)
              {
-                dh += 15;   /* dh += hscrollbar->allocation.height; */
+                dh += hscroll_req.height;
                  dh += scroll_class->scrollbar_spacing;
              }
                  dh += scroll_class->scrollbar_spacing;
              }
-       }
+        }
  
         SetSize( width+dw, height+dh );
      }
  }
  
  
         SetSize( width+dw, height+dh );
      }
  }
  
-void wxWindow::DoGetClientSize( int *width, int *height ) const
+void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_wxwindow)
      {
  
      if (!m_wxwindow)
      {
@@ -2120,47 +3005,48 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
          int dw = 0;
          int dh = 0;
  
          int dw = 0;
          int dh = 0;
  
-        if (!m_hasScrolling)
+#ifndef __WXUNIVERSAL__
+        if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
          {
          {
-            GtkStyleClass *window_class = m_wxwindow->style->klass;
-
-            if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
-            {
-                dw += 2 * window_class->xthickness;
-                dh += 2 * window_class->ythickness;
-            }
+            /* when using GTK 1.2 we set the shadow border size to 2 */
+            dw += 2 * 2;
+            dh += 2 * 2;
          }
          }
-        else
+        if (HasFlag(wxSIMPLE_BORDER))
+        {
+            /* when using GTK 1.2 we set the simple border size to 1 */
+            dw += 1 * 2;
+            dh += 1 * 2;
+        }
+#endif // __WXUNIVERSAL__
+
+        if (m_hasScrolling)
          {
              GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
          {
              GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
  
  
-#if (GTK_MINOR_VERSION == 0)
-            GtkWidget *viewport = scroll_window->viewport;
-            GtkStyleClass *viewport_class = viewport->style->klass;
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
  
  
-            if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) )
-            {
-                dw += 2 * viewport_class->xthickness;
-                dh += 2 * viewport_class->ythickness;
-            }
-#endif
-/*
-            GtkWidget *hscrollbar = scroll_window->hscrollbar;
-            GtkWidget *vscrollbar = scroll_window->vscrollbar;
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
  
  
-            we use this instead:  range.slider_width = 11 + 2*2pts edge
-*/
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
  
              if (scroll_window->vscrollbar_visible)
              {
  
              if (scroll_window->vscrollbar_visible)
              {
-                dw += 15;   /* dw += vscrollbar->allocation.width; */
+                dw += vscroll_req.width;
                  dw += scroll_class->scrollbar_spacing;
              }
  
              if (scroll_window->hscrollbar_visible)
              {
                  dw += scroll_class->scrollbar_spacing;
              }
  
              if (scroll_window->hscrollbar_visible)
              {
-                dh += 15;   /* dh += hscrollbar->allocation.height; */
+                dh += hscroll_req.height;
                  dh += scroll_class->scrollbar_spacing;
              }
          }
                  dh += scroll_class->scrollbar_spacing;
              }
          }
@@ -2168,25 +3054,41 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
          if (width) (*width) = m_width - dw;
          if (height) (*height) = m_height - dh;
      }
          if (width) (*width) = m_width - dw;
          if (height) (*height) = m_height - dh;
      }
+
+/*
+    printf( "GetClientSize, name %s ", GetName().c_str() );
+    if (width) printf( " width = %d", (*width) );
+    if (height) printf( " height = %d", (*height) );
+    printf( "\n" );
+*/
  }
  
  }
  
-void wxWindow::DoGetPosition( int *x, int *y ) const
+void wxWindowGTK::DoGetPosition( int *x, int *y ) const
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
  
-    if (x) (*x) = m_x;
-    if (y) (*y) = m_y;
+    int dx = 0;
+    int dy = 0;
+    if (m_parent && m_parent->m_wxwindow)
+    {
+        GtkPizza *pizza = GTK_PIZZA(m_parent->m_wxwindow);
+        dx = pizza->xoffset;
+        dy = pizza->yoffset;
+    }
+    
+    if (x) (*x) = m_x - dx;
+    if (y) (*y) = m_y - dy;
  }
  
  }
  
-void wxWindow::DoClientToScreen( int *x, int *y ) const
+void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_widget->window) return;
  
      GdkWindow *source = (GdkWindow *) NULL;
      if (m_wxwindow)
  
      if (!m_widget->window) return;
  
      GdkWindow *source = (GdkWindow *) NULL;
      if (m_wxwindow)
-        source = m_wxwindow->window;
+        source = GTK_PIZZA(m_wxwindow)->bin_window;
      else
          source = m_widget->window;
  
      else
          source = m_widget->window;
  
@@ -2207,15 +3109,15 @@ void wxWindow::DoClientToScreen( int *x, int *y ) const
      if (y) *y += org_y;
  }
  
      if (y) *y += org_y;
  }
  
-void wxWindow::DoScreenToClient( int *x, int *y ) const
+void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_widget->window) return;
  
      GdkWindow *source = (GdkWindow *) NULL;
      if (m_wxwindow)
  
      if (!m_widget->window) return;
  
      GdkWindow *source = (GdkWindow *) NULL;
      if (m_wxwindow)
-        source = m_wxwindow->window;
+        source = GTK_PIZZA(m_wxwindow)->bin_window;
      else
          source = m_widget->window;
  
      else
          source = m_widget->window;
  
@@ -2236,9 +3138,9 @@ void wxWindow::DoScreenToClient( int *x, int *y ) const
      if (y) *y -= org_y;
  }
  
      if (y) *y -= org_y;
  }
  
-bool wxWindow::Show( bool show )
+bool wxWindowGTK::Show( bool show )
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") );
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
  
      if (!wxWindowBase::Show(show))
      {
  
      if (!wxWindowBase::Show(show))
      {
@@ -2254,9 +3156,26 @@ bool wxWindow::Show( bool show )
      return TRUE;
  }
  
      return TRUE;
  }
  
-bool wxWindow::Enable( bool enable )
+static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") );
+    win->OnParentEnable(enable);
+
+    // Recurse, so that children have the opportunity to Do The Right Thing
+    // and reset colours that have been messed up by a parent's (really ancestor's)
+    // Enable call
+    for ( wxWindowList::Node *node = win->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *child = node->GetData();
+        if (!child->IsKindOf(CLASSINFO(wxDialog)) && !child->IsKindOf(CLASSINFO(wxFrame)))
+            wxWindowNotifyEnable(child, enable);
+    }
+}
+
+bool wxWindowGTK::Enable( bool enable )
+{
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
  
      if (!wxWindowBase::Enable(enable))
      {
  
      if (!wxWindowBase::Enable(enable))
      {
@@ -2268,32 +3187,34 @@ bool wxWindow::Enable( bool enable )
      if ( m_wxwindow )
          gtk_widget_set_sensitive( m_wxwindow, enable );
  
      if ( m_wxwindow )
          gtk_widget_set_sensitive( m_wxwindow, enable );
  
+    wxWindowNotifyEnable(this, enable);
+
      return TRUE;
  }
  
      return TRUE;
  }
  
-int wxWindow::GetCharHeight() const
+int wxWindowGTK::GetCharHeight() const
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), 12, _T("invalid window") );
+    wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
  
  
-    wxCHECK_MSG( m_font.Ok(), 12, _T("invalid font") );
+    wxCHECK_MSG( m_font.Ok(), 12, wxT("invalid font") );
  
      GdkFont *font = m_font.GetInternalFont( 1.0 );
  
      return font->ascent + font->descent;
  }
  
  
      GdkFont *font = m_font.GetInternalFont( 1.0 );
  
      return font->ascent + font->descent;
  }
  
-int wxWindow::GetCharWidth() const
+int wxWindowGTK::GetCharWidth() const
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), 8, _T("invalid window") );
+    wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
  
  
-    wxCHECK_MSG( m_font.Ok(), 8, _T("invalid font") );
+    wxCHECK_MSG( m_font.Ok(), 8, wxT("invalid font") );
  
      GdkFont *font = m_font.GetInternalFont( 1.0 );
  
      return gdk_string_width( font, "H" );
  }
  
  
      GdkFont *font = m_font.GetInternalFont( 1.0 );
  
      return gdk_string_width( font, "H" );
  }
  
-void wxWindow::GetTextExtent( const wxString& string,
+void wxWindowGTK::GetTextExtent( const wxString& string,
                                int *x,
                                int *y,
                                int *descent,
                                int *x,
                                int *y,
                                int *descent,
@@ -2303,7 +3224,7 @@ void wxWindow::GetTextExtent( const wxString& string,
      wxFont fontToUse = m_font;
      if (theFont) fontToUse = *theFont;
  
      wxFont fontToUse = m_font;
      if (theFont) fontToUse = *theFont;
  
-    wxCHECK_RET( fontToUse.Ok(), _T("invalid font") );
+    wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
  
      GdkFont *font = fontToUse.GetInternalFont( 1.0 );
      if (x) (*x) = gdk_string_width( font, string.mbc_str() );
  
      GdkFont *font = fontToUse.GetInternalFont( 1.0 );
      if (x) (*x) = gdk_string_width( font, string.mbc_str() );
@@ -2312,172 +3233,285 @@ void wxWindow::GetTextExtent( const wxString& string,
      if (externalLeading) (*externalLeading) = 0;  // ??
  }
  
      if (externalLeading) (*externalLeading) = 0;  // ??
  }
  
-void wxWindow::SetFocus()
+void wxWindowGTK::SetFocus()
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
  
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (connect_widget)
+#if 0
+    wxPrintf( "SetFocus from " );
+    if (GetClassInfo() && GetClassInfo()->GetClassName())
+        wxPrintf( GetClassInfo()->GetClassName() );
+    wxPrintf( ".\n" );
+#endif
+
+    if (m_wxwindow)
+    {
+        if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
+        {
+            // see comment in gtk_window_focus_out_callback()
+            gs_widgetLastFocus = m_wxwindow;
+            gtk_widget_grab_focus (m_wxwindow);
+        }
+    }
+    else if (m_widget)
      {
      {
-        if (GTK_WIDGET_CAN_FOCUS(connect_widget) /*&& !GTK_WIDGET_HAS_FOCUS (connect_widget)*/ )
+        if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
          {
          {
-            gtk_widget_grab_focus (connect_widget);
+            gtk_widget_grab_focus (m_widget);
          }
          }
-        else if (GTK_IS_CONTAINER(connect_widget))
+        else if (GTK_IS_CONTAINER(m_widget))
          {
          {
-            gtk_container_focus( GTK_CONTAINER(connect_widget), GTK_DIR_TAB_FORWARD );
+            gtk_container_focus( GTK_CONTAINER(m_widget), GTK_DIR_TAB_FORWARD );
          }
          else
          {
          }
          else
          {
+           // ?
          }
      }
          }
      }
+    
+#if 0
+    wxPrintf( "SetFocus finished in " );
+    if (GetClassInfo() && GetClassInfo()->GetClassName())
+        wxPrintf( GetClassInfo()->GetClassName() );
+    wxPrintf( ".\n" );
+#endif
+
  }
  
  }
  
-bool wxWindow::AcceptsFocus() const
+bool wxWindowGTK::AcceptsFocus() const
  {
      return m_acceptsFocus && wxWindowBase::AcceptsFocus();
  }
  
  {
      return m_acceptsFocus && wxWindowBase::AcceptsFocus();
  }
  
-bool wxWindow::Reparent( wxWindow *newParent )
+bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, _T("invalid window") );
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+
+    wxWindowGTK *oldParent = m_parent,
+             *newParent = (wxWindowGTK *)newParentBase;
  
  
-    gtk_widget_unparent( m_widget );
+    wxASSERT( GTK_IS_WIDGET(m_widget) );
  
      if ( !wxWindowBase::Reparent(newParent) )
          return FALSE;
  
  
      if ( !wxWindowBase::Reparent(newParent) )
          return FALSE;
  
+    wxASSERT( GTK_IS_WIDGET(m_widget) );
+
+    /* prevent GTK from deleting the widget arbitrarily */
+    gtk_widget_ref( m_widget );
+
+    if (oldParent)
+    {
+        gtk_container_remove( GTK_CONTAINER(m_widget->parent), m_widget );
+    }
+
+    wxASSERT( GTK_IS_WIDGET(m_widget) );
+
+    if (newParent)
+    {
+        /* insert GTK representation */
+        (*(newParent->m_insertCallback))(newParent, this);
+    }
+
+    /* reverse: prevent GTK from deleting the widget arbitrarily */
+    gtk_widget_unref( m_widget );
+
      return TRUE;
  }
  
      return TRUE;
  }
  
-void wxWindow::Raise()
+void wxWindowGTK::DoAddChild(wxWindowGTK *child)
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+
+    wxASSERT_MSG( (child != NULL), wxT("invalid child window") );
+
+    wxASSERT_MSG( (m_insertCallback != NULL), wxT("invalid child insertion function") );
+
+    /* add to list */
+    AddChild( child );
+
+    /* insert GTK representation */
+    (*m_insertCallback)(this, child);
+}
+
+void wxWindowGTK::Raise()
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_widget->window) return;
  
      gdk_window_raise( m_widget->window );
  }
  
  
      if (!m_widget->window) return;
  
      gdk_window_raise( m_widget->window );
  }
  
-void wxWindow::Lower()
+void wxWindowGTK::Lower()
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
  
      if (!m_widget->window) return;
  
      gdk_window_lower( m_widget->window );
  }
  
  
      if (!m_widget->window) return;
  
      gdk_window_lower( m_widget->window );
  }
  
-bool wxWindow::SetCursor( const wxCursor &cursor )
+bool wxWindowGTK::SetCursor( const wxCursor &cursor )
  {
  {
-    wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") );
-
-    if (!wxWindowBase::SetCursor(cursor))
-    {
-        // don't leave if the GTK widget has just
-        // been realized
-        if (!m_delayedCursor) return FALSE;
-    }
-    
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window)
-    {
-        // indicate that a new style has been set
-       // but it couldn't get applied as the
-       // widget hasn't been realized yet.
-       m_delayedCursor = TRUE;
-       
-       // pretend we have done something
-        return TRUE;
-    }
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
  
  
-        if ((m_widget) && (m_widget->window))
-             gdk_window_set_cursor( m_widget->window, GetCursor().GetCursor() );
+    if (cursor == m_cursor)
+       return FALSE;
  
  
-        if ((m_wxwindow) && (m_wxwindow->window))
-             gdk_window_set_cursor( m_wxwindow->window, GetCursor().GetCursor() );
+    if (g_isIdle)
+        wxapp_install_idle_handler();
  
  
-    // cursor was set
-    return TRUE;
+    if (cursor == wxNullCursor)
+       return wxWindowBase::SetCursor( *wxSTANDARD_CURSOR );
+    else
+       return wxWindowBase::SetCursor( cursor );
  }
  
  }
  
-void wxWindow::WarpPointer( int WXUNUSED(x), int WXUNUSED(y) )
+void wxWindowGTK::WarpPointer( int x, int y )
  {
  {
-    // TODO
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    /* we provide this function ourselves as it is
+       missing in GDK (top of this file)  */
+
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
+
+    if (window)
+        gdk_window_warp_pointer( window, x, y );
  }
  
  }
  
-void wxWindow::Refresh( bool eraseBackground, const wxRect *rect )
+void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect )
  {
  {
-    wxCHECK_RET( (m_widget != NULL), _T("invalid window") );
-
+    if (!m_widget) return;
      if (!m_widget->window) return;
  
      if (!m_widget->window) return;
  
+    // temporarily hide the caret to avoid nasty interactions between caret
+    // drawing and the window contents redraw
+#if 0 // def wxUSE_CARET -- doesn't seem to help :-(
+    wxCaretSuspend cs((wxWindow *)this);
+#endif // wxUSE_CARET
+
      if (eraseBackground && m_wxwindow && m_wxwindow->window)
      {
          if (rect)
          {
      if (eraseBackground && m_wxwindow && m_wxwindow->window)
      {
          if (rect)
          {
-            gdk_window_clear_area( m_wxwindow->window,
+            gdk_window_clear_area( GTK_PIZZA(m_wxwindow)->bin_window,
                                     rect->x, rect->y,
                                     rect->width, rect->height );
          }
          else
          {
                                     rect->x, rect->y,
                                     rect->width, rect->height );
          }
          else
          {
-            gdk_window_clear( m_wxwindow->window );
+            gdk_window_clear( GTK_PIZZA(m_wxwindow)->bin_window );
          }
      }
  
          }
      }
  
+    /* there is no GTK equivalent of "draw only, don't clear" so we
+       invent our own in the GtkPizza widget */
+
      if (!rect)
      {
          if (m_wxwindow)
      if (!rect)
      {
          if (m_wxwindow)
+        {
+
+/*
+            GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
+            gboolean old_clear = pizza->clear_on_draw;
+            gtk_pizza_set_clear( pizza, FALSE );
              gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL );
              gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL );
+            gtk_pizza_set_clear( pizza, old_clear );
+*/
+            GdkEventExpose gdk_event;
+            gdk_event.type = GDK_EXPOSE;
+            gdk_event.window = GTK_PIZZA(m_wxwindow)->bin_window;
+            gdk_event.count = 0;
+            gdk_event.area.x = 0;
+            gdk_event.area.y = 0;
+            gdk_event.area.width = m_wxwindow->allocation.width;
+            gdk_event.area.height = m_wxwindow->allocation.height;
+            gtk_window_expose_callback( m_wxwindow, &gdk_event, (wxWindow *)this );
+        }
          else
          else
+        {
              gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
              gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
+        }
      }
      else
      {
      }
      else
      {
-        GdkRectangle gdk_rect;
-        gdk_rect.x = rect->x;
-        gdk_rect.y = rect->y;
-        gdk_rect.width = rect->width;
-        gdk_rect.height = rect->height;
  
          if (m_wxwindow)
  
          if (m_wxwindow)
+        {
+/*
+            GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
+            gboolean old_clear = pizza->clear_on_draw;
+            gtk_pizza_set_clear( pizza, FALSE );
+
+            GdkRectangle gdk_rect;
+            gdk_rect.x = rect->x;
+            gdk_rect.y = rect->y;
+            gdk_rect.width = rect->width;
+            gdk_rect.height = rect->height;
              gtk_widget_draw( m_wxwindow, &gdk_rect );
              gtk_widget_draw( m_wxwindow, &gdk_rect );
+            gtk_window_draw_callback( m_wxwindow, &gdk_rect, this );
+
+            gtk_pizza_set_clear( pizza, old_clear );
+*/
+            GdkEventExpose gdk_event;
+            gdk_event.type = GDK_EXPOSE;
+            gdk_event.window = GTK_PIZZA(m_wxwindow)->bin_window;
+            gdk_event.count = 0;
+            gdk_event.area.x = rect->x;
+            gdk_event.area.y = rect->y;
+            gdk_event.area.width = rect->width;
+            gdk_event.area.height = rect->height;
+            gtk_window_expose_callback( m_wxwindow, &gdk_event, (wxWindow *)this );
+        }
          else
          else
+        {
+            GdkRectangle gdk_rect;
+            gdk_rect.x = rect->x;
+            gdk_rect.y = rect->y;
+            gdk_rect.width = rect->width;
+            gdk_rect.height = rect->height;
              gtk_widget_draw( m_widget, &gdk_rect );
              gtk_widget_draw( m_widget, &gdk_rect );
+        }
      }
  }
  
      }
  }
  
-void wxWindow::Clear()
+void wxWindowGTK::Clear()
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
      if (!m_widget->window) return;
  
      if (m_wxwindow && m_wxwindow->window)
      {
  
      if (!m_widget->window) return;
  
      if (m_wxwindow && m_wxwindow->window)
      {
-        gdk_window_clear( m_wxwindow->window );
+//        gdk_window_clear( m_wxwindow->window );
      }
  }
  
  #if wxUSE_TOOLTIPS
      }
  }
  
  #if wxUSE_TOOLTIPS
-void wxWindow::DoSetToolTip( wxToolTip *tip )
+void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
  {
      wxWindowBase::DoSetToolTip(tip);
  
      if (m_tooltip)
  {
      wxWindowBase::DoSetToolTip(tip);
  
      if (m_tooltip)
-        m_tooltip->Apply( this );
+        m_tooltip->Apply( (wxWindow *)this );
  }
  
  }
  
-void wxWindow::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
  {
  {
-    gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConv_current->cWX2MB(tip), (gchar*) NULL );
+    gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
  }
  #endif // wxUSE_TOOLTIPS
  
  }
  #endif // wxUSE_TOOLTIPS
  
-bool wxWindow::SetBackgroundColour( const wxColour &colour )
+bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
  {
  {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
  
      if (!wxWindowBase::SetBackgroundColour(colour))
      {
  
      if (!wxWindowBase::SetBackgroundColour(colour))
      {
@@ -2485,47 +3519,40 @@ bool wxWindow::SetBackgroundColour( const wxColour &colour )
          // been realized
          if (!m_delayedBackgroundColour) return FALSE;
      }
          // been realized
          if (!m_delayedBackgroundColour) return FALSE;
      }
-    
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window)
+
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
+
+    if (!window)
      {
          // indicate that a new style has been set
      {
          // indicate that a new style has been set
-       // but it couldn't get applied as the
-       // widget hasn't been realized yet.
-       m_delayedBackgroundColour = TRUE;
-       
-       // pretend we have done something
-        return TRUE;
+        // but it couldn't get applied as the
+        // widget hasn't been realized yet.
+        m_delayedBackgroundColour = TRUE;
      }
  
      }
  
-    if (m_wxwindow && m_wxwindow->window)
+    if ((m_wxwindow) &&
+        (m_wxwindow->window) &&
+        (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE)))
      {
          /* wxMSW doesn't clear the window here. I don't do that either to
            provide compatibility. call Clear() to do the job. */
  
      {
          /* wxMSW doesn't clear the window here. I don't do that either to
            provide compatibility. call Clear() to do the job. */
  
-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_wxwindow->window ) );
-        gdk_window_set_background( m_wxwindow->window, m_backgroundColour.GetColor() );
+        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+        gdk_window_set_background( window, m_backgroundColour.GetColor() );
      }
  
      }
  
-    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-
-    if (sysbg == m_backgroundColour)
-    {
-        m_backgroundColour = wxNullColour;
-        ApplyWidgetStyle();
-        m_backgroundColour = sysbg;
-    }
-    else
-    {
-        ApplyWidgetStyle();
-    }
+    ApplyWidgetStyle();
  
      return TRUE;
  }
  
  
      return TRUE;
  }
  
-bool wxWindow::SetForegroundColour( const wxColour &colour )
+bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
  {
  {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
  
      if (!wxWindowBase::SetForegroundColour(colour))
      {
  
      if (!wxWindowBase::SetForegroundColour(colour))
      {
@@ -2533,108 +3560,210 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
          // been realized
          if (!m_delayedForegroundColour) return FALSE;
      }
          // been realized
          if (!m_delayedForegroundColour) return FALSE;
      }
-    
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window)
-    {
-        // indicate that a new style has been set
-       // but it couldn't get applied as the
-       // widget hasn't been realized yet.
-       m_delayedForegroundColour = TRUE;
-       
-       // pretend we have done something
-        return TRUE;
-    }
  
  
-    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if (sysbg == m_foregroundColour)
-    {
-        m_backgroundColour = wxNullColour;
-        ApplyWidgetStyle();
-        m_backgroundColour = sysbg;
-    }
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
      else
      else
+        window = GetConnectWidget()->window;
+
+    if (!window)
      {
      {
-        ApplyWidgetStyle();
+        // indicate that a new style has been set
+        // but it couldn't get applied as the
+        // widget hasn't been realized yet.
+        m_delayedForegroundColour = TRUE;
      }
  
      }
  
+    ApplyWidgetStyle();
+
      return TRUE;
  }
  
      return TRUE;
  }
  
-GtkStyle *wxWindow::GetWidgetStyle()
+GtkStyle *wxWindowGTK::GetWidgetStyle()
  {
  {
-    if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
+    if (m_widgetStyle)
+    {
+        GtkStyle *remake = gtk_style_copy( m_widgetStyle );
+#ifdef __WXGTK20__
+        /* FIXME: is this necessary? */
+        _G_TYPE_IGC(remake, GtkObjectClass) = _G_TYPE_IGC(m_widgetStyle, GtkObjectClass);
+#else
+        remake->klass = m_widgetStyle->klass;
+#endif
+
+        gtk_style_unref( m_widgetStyle );
+        m_widgetStyle = remake;
+    }
+    else
+    {
+        GtkStyle *def = gtk_rc_get_style( m_widget );
+
+        if (!def)
+            def = gtk_widget_get_default_style();
  
  
-    m_widgetStyle = gtk_style_copy( gtk_widget_get_style( m_widget ) );
+        m_widgetStyle = gtk_style_copy( def );
+#ifdef __WXGTK20__
+        /* FIXME: is this necessary? */
+        _G_TYPE_IGC(m_widgetStyle, GtkObjectClass) = _G_TYPE_IGC(def, GtkObjectClass);
+#else
+        m_widgetStyle->klass = def->klass;
+#endif
+    }
  
      return m_widgetStyle;
  }
  
  
      return m_widgetStyle;
  }
  
-void wxWindow::SetWidgetStyle()
+void wxWindowGTK::SetWidgetStyle()
  {
  {
+#if DISABLE_STYLE_IF_BROKEN_THEM
+    if (m_widget->style->engine_data)
+    {
+        static bool s_warningPrinted = FALSE;
+        if (!s_warningPrinted)
+        {
+            printf( "wxWindows warning: Widget styles disabled due to buggy GTK theme.\n" );
+            s_warningPrinted = TRUE;
+        }
+        m_widgetStyle = m_widget->style;
+        return;
+    }
+#endif
+
      GtkStyle *style = GetWidgetStyle();
  
      GtkStyle *style = GetWidgetStyle();
  
-    gdk_font_unref( style->font );
-    style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+    if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))
+    {
+        gdk_font_unref( style->font );
+        style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+    }
  
      if (m_foregroundColour.Ok())
      {
  
      if (m_foregroundColour.Ok())
      {
-        m_foregroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
-        style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
-        style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
-        style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
+        m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
+        if (m_foregroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT))
+        {
+            style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor();
+            style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor();
+            style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor();
+        }
+        else
+        {
+            // Try to restore the gtk default style.  This is still a little
+            // oversimplified for what is probably really needed here for controls
+            // other than buttons, but is better than not being able to (re)set a
+            // control's foreground colour to *wxBLACK -- RL
+            GtkStyle *def = gtk_rc_get_style( m_widget );
+
+            if (!def)
+                def = gtk_widget_get_default_style();
+
+            style->fg[GTK_STATE_NORMAL] = def->fg[GTK_STATE_NORMAL];
+            style->fg[GTK_STATE_PRELIGHT] = def->fg[GTK_STATE_PRELIGHT];
+            style->fg[GTK_STATE_ACTIVE] = def->fg[GTK_STATE_ACTIVE];
+        }
      }
  
      if (m_backgroundColour.Ok())
      {
      }
  
      if (m_backgroundColour.Ok())
      {
-        m_backgroundColour.CalcPixel( gdk_window_get_colormap( m_widget->window ) );
-        style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
-        style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
-        style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
-        style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
-        style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
-        style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
-        style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
-        style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+        m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
+        if (m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNFACE))
+        {
+            style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+            style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
+            style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+            style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor();
+            style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+            style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor();
+            style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+            style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor();
+        }
+        else
+        {
+            // Try to restore the gtk default style.  This is still a little
+            // oversimplified for what is probably really needed here for controls
+            // other than buttons, but is better than not being able to (re)set a
+            // control's background colour to default grey and means resetting a
+            // button to wxSYS_COLOUR_BTNFACE will restore its usual highlighting
+            // behavior -- RL
+            GtkStyle *def = gtk_rc_get_style( m_widget );
+
+            if (!def)
+                def = gtk_widget_get_default_style();
+
+            style->bg[GTK_STATE_NORMAL] = def->bg[GTK_STATE_NORMAL];
+            style->base[GTK_STATE_NORMAL] = def->base[GTK_STATE_NORMAL];
+            style->bg[GTK_STATE_PRELIGHT] = def->bg[GTK_STATE_PRELIGHT];
+            style->base[GTK_STATE_PRELIGHT] = def->base[GTK_STATE_PRELIGHT];
+            style->bg[GTK_STATE_ACTIVE] = def->bg[GTK_STATE_ACTIVE];
+            style->base[GTK_STATE_ACTIVE] = def->base[GTK_STATE_ACTIVE];
+            style->bg[GTK_STATE_INSENSITIVE] = def->bg[GTK_STATE_INSENSITIVE];
+            style->base[GTK_STATE_INSENSITIVE] = def->base[GTK_STATE_INSENSITIVE];
+        }
      }
  }
  
      }
  }
  
-void wxWindow::ApplyWidgetStyle()
+void wxWindowGTK::ApplyWidgetStyle()
+{
+}
+
+//-----------------------------------------------------------------------------
+// Pop-up menu stuff
+//-----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE
+
+static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
  {
  {
+    *is_waiting = FALSE;
  }
  
  }
  
-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
+static void SetInvokingWindow( wxMenu *menu, wxWindowGTK *win )
  {
      menu->SetInvokingWindow( win );
  {
      menu->SetInvokingWindow( win );
-    wxNode *node = menu->GetItems().First();
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
      while (node)
      {
      while (node)
      {
-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
+        wxMenuItem *menuitem = node->GetData();
          if (menuitem->IsSubMenu())
          {
              SetInvokingWindow( menuitem->GetSubMenu(), win );
          }
          if (menuitem->IsSubMenu())
          {
              SetInvokingWindow( menuitem->GetSubMenu(), win );
          }
-        node = node->Next();
+
+        node = node->GetNext();
      }
  }
  
      }
  }
  
+// used to pass the coordinates from wxWindowGTK::DoPopupMenu() to
+// wxPopupMenuPositionCallback()
+//
+// should be safe even in the MT case as the user can hardly popup 2 menus
+// simultaneously, can he?
  static gint gs_pop_x = 0;
  static gint gs_pop_y = 0;
  
  static gint gs_pop_x = 0;
  static gint gs_pop_y = 0;
  
-static void pop_pos_callback( GtkMenu * WXUNUSED(menu),
-                              gint *x, gint *y,
-                              wxWindow *win )
+static void wxPopupMenuPositionCallback( GtkMenu *menu,
+                                         gint *x, gint *y,
+                                         gpointer WXUNUSED(user_data) )
  {
  {
-    win->ClientToScreen( &gs_pop_x, &gs_pop_y );
-    *x = gs_pop_x;
-    *y = gs_pop_y;
+    // ensure that the menu appears entirely on screen
+    GtkRequisition req;
+    gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
+
+    wxSize sizeScreen = wxGetDisplaySize();
+
+    gint xmax = sizeScreen.x - req.width,
+         ymax = sizeScreen.y - req.height;
+
+    *x = gs_pop_x < xmax ? gs_pop_x : xmax;
+    *y = gs_pop_y < ymax ? gs_pop_y : ymax;
  }
  
  }
  
-bool wxWindow::PopupMenu( wxMenu *menu, int x, int y )
+bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
  {
  {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
  
  
-    wxCHECK_MSG( menu != NULL, FALSE, _T("invalid popup-menu") );
+    wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
  
      SetInvokingWindow( menu, this );
  
  
      SetInvokingWindow( menu, this );
  
@@ -2642,24 +3771,39 @@ bool wxWindow::PopupMenu( wxMenu *menu, int x, int y )
  
      gs_pop_x = x;
      gs_pop_y = y;
  
      gs_pop_x = x;
      gs_pop_y = y;
+    ClientToScreen( &gs_pop_x, &gs_pop_y );
+
+    bool is_waiting = TRUE;
+
+    gtk_signal_connect( GTK_OBJECT(menu->m_menu), "hide",
+      GTK_SIGNAL_FUNC(gtk_pop_hide_callback), (gpointer)&is_waiting );
  
      gtk_menu_popup(
                    GTK_MENU(menu->m_menu),
  
      gtk_menu_popup(
                    GTK_MENU(menu->m_menu),
-                  (GtkWidget *) NULL,          // parent menu shell
-                  (GtkWidget *) NULL,          // parent menu item
-                  (GtkMenuPositionFunc) pop_pos_callback,
-                  (gpointer) this,             // client data
-                  0,                           // button used to activate it
-                  0 //gs_timeLastClick         // the time of activation
+                  (GtkWidget *) NULL,           // parent menu shell
+                  (GtkWidget *) NULL,           // parent menu item
+                  wxPopupMenuPositionCallback,  // function to position it
+                  NULL,                         // client data
+                  0,                            // button used to activate it
+                  gs_timeLastClick              // the time of activation
                  );
                  );
+
+    while (is_waiting)
+    {
+        while (gtk_events_pending())
+            gtk_main_iteration();
+    }
+
      return TRUE;
  }
  
      return TRUE;
  }
  
+#endif // wxUSE_MENUS_NATIVE
+
  #if wxUSE_DRAG_AND_DROP
  
  #if wxUSE_DRAG_AND_DROP
  
-void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
+void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
      GtkWidget *dnd_widget = GetConnectWidget();
  
  
      GtkWidget *dnd_widget = GetConnectWidget();
  
@@ -2673,7 +3817,7 @@ void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
  
  #endif // wxUSE_DRAG_AND_DROP
  
  
  #endif // wxUSE_DRAG_AND_DROP
  
-GtkWidget* wxWindow::GetConnectWidget()
+GtkWidget* wxWindowGTK::GetConnectWidget()
  {
      GtkWidget *connect_widget = m_widget;
      if (m_wxwindow) connect_widget = m_wxwindow;
  {
      GtkWidget *connect_widget = m_widget;
      if (m_wxwindow) connect_widget = m_wxwindow;
@@ -2681,33 +3825,21 @@ GtkWidget* wxWindow::GetConnectWidget()
      return connect_widget;
  }
  
      return connect_widget;
  }
  
-bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
+bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window )
  {
  {
-    if (m_wxwindow) return (window == m_wxwindow->window);
+    if (m_wxwindow)
+        return (window == GTK_PIZZA(m_wxwindow)->bin_window);
+
      return (window == m_widget->window);
  }
  
      return (window == m_widget->window);
  }
  
-bool wxWindow::SetFont( const wxFont &font )
+bool wxWindowGTK::SetFont( const wxFont &font )
  {
  {
-    wxCHECK_MSG( m_widget != NULL, FALSE, _T(  "invalid window") );
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
  
      if (!wxWindowBase::SetFont(font))
      {
  
      if (!wxWindowBase::SetFont(font))
      {
-        // don't leave if the GTK widget has just
-        // been realized
-        if (!m_delayedFont) return FALSE;
-    }
-    
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window)
-    {
-        // indicate that a new style has been set
-       // but it couldn't get applied as the
-       // widget hasn't been realized yet.
-       m_delayedFont = TRUE;
-       
-       // pretend we have done something
-        return TRUE;
+        return FALSE;
      }
  
      wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
      }
  
      wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
@@ -2725,52 +3857,71 @@ bool wxWindow::SetFont( const wxFont &font )
      return TRUE;
  }
  
      return TRUE;
  }
  
-void wxWindow::CaptureMouse()
+void wxWindowGTK::CaptureMouse()
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
  
  
-    wxCHECK_RET( g_capturing == FALSE, _T("CaptureMouse called twice") );
+    wxCHECK_RET( window, _T("CaptureMouse() failed") );
  
  
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window) return;
-    
-    gtk_grab_add( connect_widget );
-    gdk_pointer_grab( connect_widget->window, FALSE,
+    wxCursor* cursor = & m_cursor;
+    if (!cursor->Ok())
+        cursor = wxSTANDARD_CURSOR;
+
+    gdk_pointer_grab( window, FALSE,
                        (GdkEventMask)
                           (GDK_BUTTON_PRESS_MASK |
                            GDK_BUTTON_RELEASE_MASK |
                        (GdkEventMask)
                           (GDK_BUTTON_PRESS_MASK |
                            GDK_BUTTON_RELEASE_MASK |
+                          GDK_POINTER_MOTION_HINT_MASK |
                            GDK_POINTER_MOTION_MASK),
                        (GdkWindow *) NULL,
                            GDK_POINTER_MOTION_MASK),
                        (GdkWindow *) NULL,
-                      (GdkCursor *) NULL,
-                      GDK_CURRENT_TIME );
-    g_capturing = TRUE;
+                      cursor->GetCursor(),
+                      (guint32)GDK_CURRENT_TIME );
+    g_captureWindow = this;
+    g_captureWindowHasMouse = TRUE;
  }
  
  }
  
-void wxWindow::ReleaseMouse()
+void wxWindowGTK::ReleaseMouse()
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
  
-    wxCHECK_RET( g_capturing == TRUE, _T("ReleaseMouse called twice") );
+    wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
  
  
-    GtkWidget *connect_widget = GetConnectWidget();
-    if (!connect_widget->window) return;
-    
-    gtk_grab_remove( connect_widget );
-    gdk_pointer_ungrab ( GDK_CURRENT_TIME );
-    g_capturing = FALSE;
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
+
+    if (!window)
+        return;
+
+    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+    g_captureWindow = (wxWindowGTK*) NULL;
  }
  
  }
  
-bool wxWindow::IsRetained() const
+/* static */
+wxWindow *wxWindowBase::GetCapture()
+{
+    return (wxWindow *)g_captureWindow;
+}
+
+bool wxWindowGTK::IsRetained() const
  {
      return FALSE;
  }
  
  {
      return FALSE;
  }
  
-void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
+void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
        int range, bool refresh )
  {
        int range, bool refresh )
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
  
-    wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") );
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
  
      m_hasScrolling = TRUE;
  
  
      m_hasScrolling = TRUE;
  
@@ -2829,11 +3980,11 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
          gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
  }
  
          gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
  }
  
-void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
+void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
  
-    wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") );
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
  
      if (orient == wxHORIZONTAL)
      {
  
      if (orient == wxHORIZONTAL)
      {
@@ -2856,23 +4007,36 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
          m_vAdjust->value = fpos;
      }
  
          m_vAdjust->value = fpos;
      }
  
-    if (!m_isScrolling)  /* prevent recursion */
+    if (m_wxwindow->window)
      {
      {
-        if (m_wxwindow->window)
+        if (orient == wxHORIZONTAL)
          {
          {
-            if (orient == wxHORIZONTAL)
-                gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-            else
-                gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
+                (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
+
+            gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
+
+            gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
+                (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
+        }
+        else
+        {
+            gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
+                (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
+
+            gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
+
+            gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
+                (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
          }
      }
  }
  
          }
      }
  }
  
-int wxWindow::GetScrollThumb( int orient ) const
+int wxWindowGTK::GetScrollThumb( int orient ) const
  {
  {
-    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
  
  
-    wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") );
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->page_size+0.5);
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->page_size+0.5);
@@ -2880,11 +4044,11 @@ int wxWindow::GetScrollThumb( int orient ) const
          return (int)(m_vAdjust->page_size+0.5);
  }
  
          return (int)(m_vAdjust->page_size+0.5);
  }
  
-int wxWindow::GetScrollPos( int orient ) const
+int wxWindowGTK::GetScrollPos( int orient ) const
  {
  {
-    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
  
  
-    wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") );
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->value+0.5);
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->value+0.5);
@@ -2892,11 +4056,11 @@ int wxWindow::GetScrollPos( int orient ) const
          return (int)(m_vAdjust->value+0.5);
  }
  
          return (int)(m_vAdjust->value+0.5);
  }
  
-int wxWindow::GetScrollRange( int orient ) const
+int wxWindowGTK::GetScrollRange( int orient ) const
  {
  {
-    wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") );
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
  
  
-    wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") );
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->upper+0.5);
  
      if (orient == wxHORIZONTAL)
          return (int)(m_hAdjust->upper+0.5);
@@ -2904,61 +4068,109 @@ int wxWindow::GetScrollRange( int orient ) const
          return (int)(m_vAdjust->upper+0.5);
  }
  
          return (int)(m_vAdjust->upper+0.5);
  }
  
-void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
+void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
  {
  {
-    wxCHECK_RET( m_widget != NULL, _T("invalid window") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
  
  
-    wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") );
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
  
  
-    if (!m_scrollGC)
-    {
-        m_scrollGC = gdk_gc_new( m_wxwindow->window );
-        gdk_gc_set_exposures( m_scrollGC, TRUE );
-    }
-    
-    wxNode *node = m_children.First();
-    while (node)
-    {
-        wxWindow *child = (wxWindow*) node->Data();
-       child->Move( child->m_x + dx, child->m_y + dy );
-       node = node->Next();
-    }
+    if ((dx == 0) && (dy == 0)) return;
  
  
-    int cw = 0;
-    int ch = 0;
-    GetClientSize( &cw, &ch );
-    int w = cw - abs(dx);
-    int h = ch - abs(dy);
-    
-    if ((h < 0) || (w < 0))
+    m_clipPaintRegion = TRUE;
+    gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
+    m_clipPaintRegion = FALSE;
+
+/*
+    if (m_children.GetCount() > 0)
      {
      {
-        Refresh();
+        gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
      }
      else
      {
      }
      else
      {
-        int s_x = 0;
-        int s_y = 0;
-        if (dx < 0) s_x = -dx;
-        if (dy < 0) s_y = -dy;
-        int d_x = 0;
-        int d_y = 0;
-        if (dx > 0) d_x = dx;
-        if (dy > 0) d_y = dy;
+        GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
+
+        pizza->xoffset -= dx;
+        pizza->yoffset -= dy;
+
+        GdkGC *m_scrollGC = gdk_gc_new( pizza->bin_window );
+        gdk_gc_set_exposures( m_scrollGC, TRUE );
  
  
-        gdk_window_copy_area( m_wxwindow->window, m_scrollGC, d_x, d_y,
-            m_wxwindow->window, s_x, s_y, w, h );
+        int cw = 0;
+        int ch = 0;
+        GetClientSize( &cw, &ch );
+        int w = cw - abs(dx);
+        int h = ch - abs(dy);
  
  
-        wxRect rect;
-        if (dx < 0) rect.x = cw+dx; else rect.x = 0;
-        if (dy < 0) rect.y = ch+dy; else rect.y = 0;
-        if (dy != 0) rect.width = cw; else rect.width = abs(dx);
-        if (dx != 0) rect.height = ch; else rect.height = abs(dy);
+        if ((h < 0) || (w < 0))
+        {
+            Refresh();
+        }
+        else
+        {
+            int s_x = 0;
+            int s_y = 0;
+            if (dx < 0) s_x = -dx;
+            if (dy < 0) s_y = -dy;
+            int d_x = 0;
+            int d_y = 0;
+            if (dx > 0) d_x = dx;
+            if (dy > 0) d_y = dy;
+
+            gdk_window_copy_area( pizza->bin_window, m_scrollGC, d_x, d_y,
+                pizza->bin_window, s_x, s_y, w, h );
+
+            wxRect rect;
+            if (dx < 0) rect.x = cw+dx; else rect.x = 0;
+            if (dy < 0) rect.y = ch+dy; else rect.y = 0;
+            if (dy != 0) rect.width = cw; else rect.width = abs(dx);
+            if (dx != 0) rect.height = ch; else rect.height = abs(dy);
+
+            Refresh( TRUE, &rect );
+        }
  
  
-        Refresh( TRUE, &rect );
+        gdk_gc_unref( m_scrollGC );
      }
      }
+*/
+}
+
+// Find the wxWindow at the current mouse position, also returning the mouse
+// position.
+wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+{
+    pt = wxGetMousePosition();
+    wxWindow* found = wxFindWindowAtPoint(pt);
+    return found;
  }
  
  }
  
-void wxWindow::SetScrolling(bool scroll)
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
  {
  {
-    m_isScrolling = g_blockEventsOnScroll = scroll;
+  /* This crashes when used within wxHelpContext,
+     so we have to use the X-specific implementation below.
+    gint x, y;
+    GdkModifierType *mask;
+    (void) gdk_window_get_pointer(NULL, &x, &y, mask);
+
+    return wxPoint(x, y);
+  */
+
+    int x, y;
+    GdkWindow* windowAtPtr = gdk_window_at_pointer(& x, & y);
+    if (!windowAtPtr)
+      return wxPoint(-999, -999);
+
+    Display *display = GDK_WINDOW_XDISPLAY(windowAtPtr);
+    Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
+    Window rootReturn, childReturn;
+    int rootX, rootY, winX, winY;
+    unsigned int maskReturn;
+
+    XQueryPointer (display,
+           rootWindow,
+           &rootReturn,
+                   &childReturn,
+                   &rootX, &rootY, &winX, &winY, &maskReturn);
+    return wxPoint(rootX, rootY);
+
  }
  }
+