]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/window.cpp
Typos in docs.
[wxWidgets.git] / src / gtk1 / window.cpp
index 26f5f1b9897af49d8a239edbd1c408630055423b..ccdd0eb927680de2b78829159c0c409e410b4a86 100644 (file)
@@ -2,15 +2,14 @@
 // Name:        window.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
-#pragma implementation "window.h"
+    #pragma implementation "window.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
-#include "wx/dcclient.h"
-#include "wx/dnd.h"
-#include "wx/mdi.h"
-#include "wx/notebook.h"
-#include "gdk/gdkkeysyms.h"
-#include <math.h>
-#include "wx/gtk/win_gtk.h"
-#include "gdk/gdkprivate.h"
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#if wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"
+#endif
 
-extern wxList wxPendingDelete;
-extern wxList wxTopLevelWindows;
-extern bool   g_blockEventsOnDrag;
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif
 
-//-----------------------------------------------------------------------------
-// GTK callbacks for wxWindows event system
-//-----------------------------------------------------------------------------
+#include "wx/menu.h"
+#include "wx/statusbr.h"
+#include "wx/intl.h"
+#include "wx/settings.h"
+#include "wx/log.h"
 
-//-----------------------------------------------------------------------------
-// expose (of m_wxwindow, not of m_widget)
+#ifdef __WXDEBUG__
+    #include "wx/thread.h"
+#endif
 
-void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-/*
-  printf( "OnExpose from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-  
-  printf( "x: %d \n", gdk_event->area.x );
-  printf( "y: %d \n", gdk_event->area.y );
-  printf( "w: %d \n", gdk_event->area.width );
-  printf( "h: %d \n", gdk_event->area.height );
-*/
+#include <math.h>
 
-  win->m_updateRegion.Union( gdk_event->area.x,
-                             gdk_event->area.y,
-                            gdk_event->area.width,
-                            gdk_event->area.height );
-                            
-  if (gdk_event->count > 0) return;
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkkeysyms.h>
+#include <wx/gtk/win_gtk.h>
 
-  wxPaintEvent event( win->GetId() );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-  
-  win->m_updateRegion.Clear();
-};
+#include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------
-// draw (of m_wxwindow, not of m_widget)
+// documentation on internals
+//-----------------------------------------------------------------------------
 
-void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
 /*
-  printf( "OnDraw from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-  
-  printf( "x: %d \n", rect->x );
-  printf( "y: %d \n", rect->y );
-  printf( "w: %d \n", rect->width );
-  printf( "h: %d \n", rect->height );
-*/
+   I have been asked several times about writing some documentation about
+   the GTK port of wxWindows, especially its internal structures. Obviously,
+   you cannot understand wxGTK without knowing a little about the GTK, but
+   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:
+
+   1) Define the rudimentary behaviour common to all window classes, such as
+   resizing, intercepting user input (so as to make it possible to use these
+   events for special purposes in a derived class), window names etc.
+
+   2) Provide the possibility to contain and manage children, if the derived
+   class is allowed to contain children, which holds true for those window
+   classes which do not display a native GTK widget. To name them, these
+   classes are wxPanel, wxScrolledWindow, wxDialog, wxFrame. The MDI frame-
+   work classes are a special case and are handled a bit differently from
+   the rest. The same holds true for the wxNotebook class.
+
+   3) Provide the possibility to draw into a client area of a window. This,
+   too, only holds true for classes that do not display a native GTK widget
+   as above.
+
+   4) Provide the entire mechanism for scrolling widgets. This actual inter-
+   face for this is usually in wxScrolledWindow, but the GTK implementation
+   is in this class.
+
+   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
+   widget from the actual widget you are handling. Last but not least some
+   special classes (e.g. wxFrame) handle different categories of widgets and
+   still have the possibility to draw something in the client area.
+   It was therefore required to write a special purpose GTK widget, that would
+   represent a client area in the sense of wxWindows capable to do the jobs
+   2), 3) and 4). I have written this class and it resides in win_gtk.c of
+   this directory.
+
+   All windows must have a widget, with which they interact with other under-
+   lying GTK widgets. It is this widget, e.g. that has to be resized etc and
+   thw wxWindow class has a member variable called m_widget which holds a
+   pointer to this widget. When the window class represents a GTK native widget,
+   this is (in most cases) the only GTK widget the class manages. E.g. the
+   wxStatitText class handles only a GtkLabel widget a pointer to which you
+   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 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
+   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-
+   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.
+
+   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.
 
-  win->m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
-                            
-  wxPaintEvent event( win->GetId() );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-  
-  win->m_updateRegion.Clear();
-};
+*/
 
 //-----------------------------------------------------------------------------
-// size 
-//      I don't any longer intercept GTK's internal resize events (except frames)
+// data
+//-----------------------------------------------------------------------------
 
-/*
-void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-  
-  return;
-
-  if ((win->m_x == alloc->x) &&
-      (win->m_y == alloc->y) &&
-      (win->m_width == alloc->width) &&
-      (win->m_height == alloc->height))
-  {
-    return;
-  };
-  
-  printf( "OnResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( " .\n" );
-    
-  printf( "  Old: X: %d  Y: %d ", win->m_x, win->m_y );
-  printf( "  W: %d  H: %d ", win->m_width, win->m_height );
-  printf( " .\n" );
-    
-  printf( "  New: X: %d  Y: %d ", alloc->x, alloc->y );
-  printf( "  W: %d  H: %d ", alloc->width, alloc->height );
-  printf( " .\n" );
-  
-  wxSizeEvent event( wxSize( alloc->width, alloc->height), win->GetId() );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
-*/
+extern wxList     wxPendingDelete;
+extern bool       g_blockEventsOnDrag;
+extern bool       g_blockEventsOnScroll;
+extern wxCursor   g_globalCursor;
+static wxWindow  *g_captureWindow = (wxWindow*) NULL;
 
-//-----------------------------------------------------------------------------
-// key_press
+/* extern */ wxWindow  *g_focusWindow = (wxWindow*) NULL;
 
-gint gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget), GdkEventKey *gdk_event, wxWindow *win )
-{ 
-  if (!win->HasVMT()) return FALSE;
-  if (g_blockEventsOnDrag) return 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;
 
-/*
-  printf( "OnKeyPress from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
+/* 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;
 
-  long key_code = 0;
-  switch (gdk_event->keyval)
-  {
-    case GDK_BackSpace:   key_code = WXK_BACK;         break;
-    case GDK_Tab:         key_code = WXK_TAB;          break;
-    case GDK_Linefeed:    key_code = WXK_RETURN;       break;
-    case GDK_Clear:      key_code = WXK_CLEAR;         break;
-    case GDK_Return:     key_code = WXK_RETURN;        break;
-    case GDK_Pause:      key_code = WXK_PAUSE;         break;
-    case GDK_Scroll_Lock: key_code = WXK_SCROLL;       break;
-    case GDK_Escape:     key_code = WXK_ESCAPE;        break;
-    case GDK_Delete:     key_code = WXK_DELETE;        break;
-    case GDK_Home:       key_code = WXK_HOME;          break;
-    case GDK_Left:       key_code = WXK_LEFT;          break;
-    case GDK_Up:         key_code = WXK_UP;            break;
-    case GDK_Right:      key_code = WXK_RIGHT;         break;
-    case GDK_Down:       key_code = WXK_DOWN;          break;
-    case GDK_Prior:      key_code = WXK_PRIOR;         break;
-//  case GDK_Page_Up:    key_code = WXK_PAGEUP;        break;
-    case GDK_Next:       key_code = WXK_NEXT;          break;
-//  case GDK_Page_Down:   key_code = WXK_PAGEDOWN;     break;
-    case GDK_End:        key_code = WXK_END;           break;
-    case GDK_Begin:      key_code = WXK_HOME;          break;
-    case GDK_Select:     key_code = WXK_SELECT;        break;
-    case GDK_Print:      key_code = WXK_PRINT;         break;
-    case GDK_Execute:    key_code = WXK_EXECUTE;       break;
-    case GDK_Insert:     key_code = WXK_INSERT;        break;
-    case GDK_Num_Lock:   key_code = WXK_NUMLOCK;       break;
-    case GDK_KP_Tab:     key_code = WXK_TAB;           break;
-    case GDK_KP_Enter:   key_code = WXK_RETURN;        break;
-    case GDK_KP_Home:    key_code = WXK_HOME;          break;
-    case GDK_KP_Left:    key_code = WXK_LEFT;          break;
-    case GDK_KP_Up:      key_code = WXK_UP;            break;
-    case GDK_KP_Right:           key_code = WXK_RIGHT;         break;
-    case GDK_KP_Down:    key_code = WXK_DOWN;          break;
-    case GDK_KP_Prior:   key_code = WXK_PRIOR;         break;
-//  case GDK_KP_Page_Up:  key_code = WXK_PAGEUP;       break;
-    case GDK_KP_Next:    key_code = WXK_NEXT;          break;
-//  case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN;    break;
-    case GDK_KP_End:     key_code = WXK_END;           break;
-    case GDK_KP_Begin:   key_code = WXK_HOME;          break;
-    case GDK_KP_Insert:          key_code = WXK_INSERT;        break;
-    case GDK_KP_Delete:          key_code = WXK_DELETE;        break;
-    case GDK_KP_Multiply: key_code = WXK_MULTIPLY;     break;
-    case GDK_KP_Add:     key_code = WXK_ADD;           break;
-    case GDK_KP_Separator: key_code = WXK_SEPARATOR;   break;
-    case GDK_KP_Subtract: key_code = WXK_SUBTRACT;     break;
-    case GDK_KP_Decimal:  key_code = WXK_DECIMAL;      break;
-    case GDK_KP_Divide:          key_code = WXK_DIVIDE;        break;
-    case GDK_KP_0:       key_code = WXK_NUMPAD0;       break;
-    case GDK_KP_1:       key_code = WXK_NUMPAD1;       break;
-    case GDK_KP_2:       key_code = WXK_NUMPAD2;       break;
-    case GDK_KP_3:       key_code = WXK_NUMPAD3;       break;
-    case GDK_KP_4:       key_code = WXK_NUMPAD4;       break;
-    case GDK_KP_5:       key_code = WXK_NUMPAD5;       break;
-    case GDK_KP_6:       key_code = WXK_NUMPAD6;       break;
-    case GDK_KP_7:       key_code = WXK_NUMPAD7;       break;
-    case GDK_KP_8:       key_code = WXK_NUMPAD7;       break;
-    case GDK_KP_9:       key_code = WXK_NUMPAD9;       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_F4:         key_code = WXK_F4;            break;
-    case GDK_F5:         key_code = WXK_F5;            break;
-    case GDK_F6:         key_code = WXK_F6;            break;
-    case GDK_F7:         key_code = WXK_F7;            break;
-    case GDK_F8:         key_code = WXK_F8;            break;
-    case GDK_F9:         key_code = WXK_F9;            break;
-    case GDK_F10:        key_code = WXK_F10;           break;
-    case GDK_F11:        key_code = WXK_F11;           break;
-    case GDK_F12:        key_code = WXK_F12;           break;
-    default:
-    {
-      if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) 
-        key_code = gdk_event->keyval;
-    };
-  };
-
-  if (!key_code) return FALSE;
-  
-  wxKeyEvent event( wxEVT_CHAR );
-  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_keyCode = key_code;
-  event.m_x = 0;
-  event.m_y = 0;
-  event.SetEventObject( win );
-  return win->ProcessEvent( event );
-};
-
-//-----------------------------------------------------------------------------
-// button_press
-
-gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
-{ 
-  if (widget->window != gdk_event->window) return FALSE;
-  if (g_blockEventsOnDrag) return FALSE;
-
-  if (win->m_wxwindow)
-  {
-    if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow) && !GTK_WIDGET_HAS_FOCUS (win->m_wxwindow) )
-    {
-      gtk_widget_grab_focus (win->m_wxwindow);
-      
-/*
-      printf( "GrabFocus from " );
-      if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-      printf( ".\n" );
-*/
-      
-    };
-  };
-    
-  if (!win->HasVMT()) return FALSE;
-    
-/*
-  printf( "OnButtonPress from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  wxEventType event_type = wxEVT_LEFT_DOWN;
-  
-  if (gdk_event->button == 1)
-  {
-    switch (gdk_event->type)
-    {
-      case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; break;
-      case GDK_2BUTTON_PRESS: event_type = wxEVT_LEFT_DCLICK; break;
-      default:  break;
-    };
-  }
-  else if (gdk_event->button == 2)
-  {
-    switch (gdk_event->type)
-    {
-      case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break;
-      case GDK_2BUTTON_PRESS: event_type = wxEVT_MIDDLE_DCLICK; break;
-      default:  break;
-    };
-  }
-  else if (gdk_event->button == 3)
-  {
-    switch (gdk_event->type)
-    {
-      case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break;
-      case GDK_2BUTTON_PRESS: event_type = wxEVT_RIGHT_DCLICK; break;
-      default:  break;
-    };
-  };
-  
-  wxMouseEvent event( event_type );
-  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;
-  event.SetEventObject( win );
-  
-  win->ProcessEvent( event );
-  
-  return TRUE;
-};
-
-//-----------------------------------------------------------------------------
-// button_release
-
-gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
-{ 
-  if (widget->window != gdk_event->window) return TRUE;
-
-  if (g_blockEventsOnDrag) return FALSE;
-
-  if (!win->HasVMT()) return FALSE;
-/*
-  printf( "OnButtonRelease from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  wxEventType event_type = wxEVT_NULL;
-  
-  switch (gdk_event->button)
-  {
-    case 1: event_type = wxEVT_LEFT_UP; break;
-    case 2: event_type = wxEVT_MIDDLE_UP; break;
-    case 3: event_type = wxEVT_RIGHT_UP; break;
-  };
-
-  wxMouseEvent event( event_type );
-  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;
-  event.SetEventObject( win );
-  
-  return win->ProcessEvent( event );
-};
-
-//-----------------------------------------------------------------------------
-// motion_notify
-
-gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win )
-{ 
-  if (widget->window != gdk_event->window) return TRUE;
-
-  if (g_blockEventsOnDrag) return FALSE;
-
-  if (!win->HasVMT()) return FALSE;
-  
-/*
-  printf( "OnMotion from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  wxMouseEvent event( wxEVT_MOTION );
-  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;
-  event.SetEventObject( win );
-  
-  win->ProcessEvent( event );
-  
-  return FALSE;
-};
-
-//-----------------------------------------------------------------------------
-// focus_in
-
-void gtk_window_focus_in_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win )
-{
-  if (g_blockEventsOnDrag) return;
-  if (win->m_wxwindow)
-  {
-    if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
-    {
-      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" );
-*/
-    };
-  };
-  
-  if (!win->HasVMT()) return;
-  
-/*
-  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 );
-  win->ProcessEvent( event );
-};
+extern bool g_mainThreadLocked;
 
 //-----------------------------------------------------------------------------
-// focus out
+// debug
+//-----------------------------------------------------------------------------
 
-void gtk_window_focus_out_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win )
+#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),
+                                         const wxChar *WXUNUSED(name) )
 {
-  if (g_blockEventsOnDrag) return;
-  if (win->m_wxwindow)
-  {
-    if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow))
-      GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS);
-  };
-  
-  if (!win->HasVMT()) return;
-  
 /*
-  printf( "OnKillFocus from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
+    static bool s_done = FALSE;
+    if ( !s_done )
+    {
+        wxLog::AddTraceMask("focus");
+        s_done = TRUE;
+    }
+    wxLogTrace(wxT("FOCUS NOW AT: %s"), name);
 */
-  
-  wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
 
-//-----------------------------------------------------------------------------
-// vertical scroll
+    return FALSE;
+}
 
-void gtk_window_vscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
+void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window )
 {
-  if (g_blockEventsOnDrag) return;
+    // suppress warnings about gtk_debug_focus_in_callback being unused with
+    // this "if ( 0 )"
+    if ( 0 )
+    {
+        wxString tmp = name;
+        tmp += wxT(" FROM ");
+        tmp += window;
 
-/*
-  printf( "OnVScroll from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  if (!win->HasVMT()) return;
-  
-  float diff = win->m_vAdjust->value - win->m_oldVerticalPos;
-  if (fabs(diff) < 0.2) return;
-  
-/*
-  int i = (int)(win->m_oldVerticalPos+0.5);
-  printf( "Old value: %d.\n", i );
-  i = (int)(win->m_vAdjust->value+0.5);
-  printf( "Sending new value: %d.\n", i );
-*/
+        wxChar *s = new wxChar[tmp.Length()+1];
 
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_vAdjust->step_increment;
-  float page_step = win->m_vAdjust->page_increment;
-  
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
-      
-  int value = (int)(win->m_vAdjust->value+0.5);
-
-  wxScrollEvent event( command, win->GetId(), value, wxVERTICAL );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
-
-//-----------------------------------------------------------------------------
-// horizontal scroll
-
-void gtk_window_hscroll_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
-{ 
-  if (g_blockEventsOnDrag) return;
-  
-/*
-  printf( "OnHScroll from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  if (!win->HasVMT()) return;
-    
-  float diff = win->m_hAdjust->value - win->m_oldHorizontalPos;
-  if (fabs(diff) < 0.2) return;
-  
-/*
-  int i = (int)(win->m_oldHorizontalPos+0.5);
-  printf( "Old value: %d.\n", i );
-  i = (int)(win->m_hAdjust->value+0.5);
-  printf( "Sending new value: %d.\n", i );
-*/
-      
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_hAdjust->step_increment;
-  float page_step = win->m_hAdjust->page_increment;
-  
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
+        wxStrcpy( s, tmp );
+
+        gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event",
+          GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s );
+    }
+}
 
-  int value = (int)(win->m_hAdjust->value+0.5);
-      
-  wxScrollEvent event( command, win->GetId(), value, wxHORIZONTAL );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
+#else
+#define DEBUG_MAIN_THREAD
+#endif // Debug
 
 //-----------------------------------------------------------------------------
-// vertical scroll change
+// missing gdk functions
+//-----------------------------------------------------------------------------
 
-void gtk_window_vscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
+void
+gdk_window_warp_pointer (GdkWindow      *window,
+                         gint            x,
+                         gint            y)
 {
-  if (g_blockEventsOnDrag) return;
+  GdkWindowPrivate *priv;
 
-/*
-  printf( "OnVScroll change from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  if (!win->HasVMT()) return;
-  
-  wxEventType command = wxEVT_SCROLL_THUMBTRACK;
-  int value = (int)(win->m_vAdjust->value+0.5);
+  if (!window)
+    window = (GdkWindow*) &gdk_root_parent;
 
-  wxScrollEvent event( command, win->GetId(), value, wxVERTICAL );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
+  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 );
+  }
+}
 
 //-----------------------------------------------------------------------------
-// horizontal scroll change
+// idle system
+//-----------------------------------------------------------------------------
 
-void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxWindow *win )
-{ 
-  if (g_blockEventsOnDrag) return;
-  
-/*
-  printf( "OnHScroll change from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-*/
-  
-  if (!win->HasVMT()) return;
-    
-  wxEventType command = wxEVT_SCROLL_THUMBTRACK;
-  int value = (int)(win->m_hAdjust->value+0.5);
-      
-  wxScrollEvent event( command, win->GetId(), value, wxHORIZONTAL );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-};
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
-// drop
+// local code (see below)
+//-----------------------------------------------------------------------------
 
-void gtk_window_drop_callback( GtkWidget *widget, GdkEvent *event, wxWindow *win )
+static void draw_frame( GtkWidget *widget, wxWindow *win )
 {
-  printf( "OnDrop.\n" );
+    if (!win->m_hasVMT)
+        return;
 
-  if (win->GetDropTarget())
-  {
-    int x = 0;
-    int y = 0;
-    gdk_window_get_pointer( widget->window, &x, &y, NULL );
-    win->GetDropTarget()->Drop( event, x, y );
-  };
-  
-/*
-  g_free (event->dropdataavailable.data);
-  g_free (event->dropdataavailable.data_type);
-*/
-}
+    int dw = 0;
+    int dh = 0;
 
-//-----------------------------------------------------------------------------
-// destroy
+    if (win->HasScrolling())
+    {
+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget);
+            
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->vscrollbar)->klass )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
+                
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->hscrollbar)->klass )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
+
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass );
+
+            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;
+    }
 
-bool gtk_window_destroy_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxWindow *win )
-{ 
-  printf( "OnDestroy from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( ".\n" );
-  printf( "Goodbye.\n" );
-  printf( "     Robert Roebling.\n" );
-  
-  return FALSE;
-};
+    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;
+    }
+}
 
 //-----------------------------------------------------------------------------
-// enter
+// "expose_event" of m_widget
+//-----------------------------------------------------------------------------
 
-bool gtk_window_enter_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
 {
-  if (g_blockEventsOnDrag) return FALSE;
-  
-  if (widget->window)
-    gdk_window_set_cursor( widget->window, win->m_cursor->GetCursor() );
-    
-  return TRUE;
-};
-    
+    if (gdk_event->count > 0) return;
+    draw_frame( widget, win );
+}
+
+//-----------------------------------------------------------------------------
+// "draw" of m_widget
 //-----------------------------------------------------------------------------
-// leave
 
-bool gtk_window_leave_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *WXUNUSED(win) )
+static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win )
 {
-  if (g_blockEventsOnDrag) return FALSE;
-  
-  if (widget->window)
-    gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() );
-    
-  return TRUE;
-};
-    
+    draw_frame( widget, win );
+}
+
 //-----------------------------------------------------------------------------
-// wxWindow implementation
+// key code mapping routines
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxWindow,wxEvtHandler)
+static long map_to_unmodified_wx_keysym( KeySym keysym )
+{
+    guint key_code = 0;
+
+    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_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_ISO_Left_Tab:
+        case GDK_Tab:           key_code = WXK_TAB;         break;
+        case GDK_Linefeed:      key_code = WXK_RETURN;      break;
+        case GDK_Clear:         key_code = WXK_CLEAR;       break;
+        case GDK_Return:        key_code = WXK_RETURN;      break;
+        case GDK_Pause:         key_code = WXK_PAUSE;       break;
+        case GDK_Scroll_Lock:   key_code = WXK_SCROLL;      break;
+        case GDK_Escape:        key_code = WXK_ESCAPE;      break;
+        case GDK_Delete:        key_code = WXK_DELETE;      break;
+        case GDK_Home:          key_code = WXK_HOME;        break;
+        case GDK_Left:          key_code = WXK_LEFT;        break;
+        case GDK_Up:            key_code = WXK_UP;          break;
+        case GDK_Right:         key_code = WXK_RIGHT;       break;
+        case GDK_Down:          key_code = WXK_DOWN;        break;
+        case GDK_Prior:         key_code = WXK_PRIOR;       break;
+//      case GDK_Page_Up:       key_code = WXK_PAGEUP;      break;
+        case GDK_Next:          key_code = WXK_NEXT;        break;
+//      case GDK_Page_Down:     key_code = WXK_PAGEDOWN;    break;
+        case GDK_End:           key_code = WXK_END;         break;
+        case GDK_Begin:         key_code = WXK_HOME;        break;
+        case GDK_Select:        key_code = WXK_SELECT;      break;
+        case GDK_Print:         key_code = WXK_PRINT;       break;
+        case GDK_Execute:       key_code = WXK_EXECUTE;     break;
+        case GDK_Insert:        key_code = WXK_INSERT;      break;
+        case GDK_Num_Lock:      key_code = WXK_NUMLOCK;     break;
+
+        case GDK_KP_0:         key_code = WXK_NUMPAD0;      break;
+        case GDK_KP_1:         key_code = WXK_NUMPAD1;      break;
+        case GDK_KP_2:         key_code = WXK_NUMPAD2;      break;
+        case GDK_KP_3:         key_code = WXK_NUMPAD3;      break;
+        case GDK_KP_4:         key_code = WXK_NUMPAD4;      break;
+        case GDK_KP_5:         key_code = WXK_NUMPAD5;      break;
+        case GDK_KP_6:         key_code = WXK_NUMPAD6;      break;
+        case GDK_KP_7:         key_code = WXK_NUMPAD7;      break;
+        case GDK_KP_8:         key_code = WXK_NUMPAD8;      break;
+        case GDK_KP_9:         key_code = WXK_NUMPAD9;      break;
+        case GDK_KP_Space:     key_code = WXK_NUMPAD_SPACE; break;
+        case GDK_KP_Tab:       key_code = WXK_NUMPAD_TAB;   break;
+        case GDK_KP_Enter:     key_code = WXK_NUMPAD_ENTER; break;
+        case GDK_KP_F1:        key_code = WXK_NUMPAD_F1;    break;
+        case GDK_KP_F2:        key_code = WXK_NUMPAD_F2;    break;
+        case GDK_KP_F3:        key_code = WXK_NUMPAD_F3;    break;
+        case GDK_KP_F4:        key_code = WXK_NUMPAD_F4;    break;
+        case GDK_KP_Home:      key_code = WXK_NUMPAD_HOME;  break;
+        case GDK_KP_Left:      key_code = WXK_NUMPAD_LEFT;  break;
+        case GDK_KP_Up:        key_code = WXK_NUMPAD_UP;    break;
+        case GDK_KP_Right:     key_code = WXK_NUMPAD_RIGHT; break;
+        case GDK_KP_Down:      key_code = WXK_NUMPAD_DOWN;  break;
+        case GDK_KP_Prior:     key_code = WXK_NUMPAD_PRIOR; break;
+//      case GDK_KP_Page_Up:   key_code = WXK_NUMPAD_PAGEUP;   break;
+        case GDK_KP_Next:      key_code = WXK_NUMPAD_NEXT;  break;
+//      case GDK_KP_Page_Down: key_code = WXK_NUMPAD_PAGEDOWN; break;
+        case GDK_KP_End:       key_code = WXK_NUMPAD_END;   break;
+        case GDK_KP_Begin:     key_code = WXK_NUMPAD_BEGIN; break;
+        case GDK_KP_Insert:    key_code = WXK_NUMPAD_INSERT; break;
+        case GDK_KP_Delete:    key_code = WXK_NUMPAD_DELETE; break;
+        case GDK_KP_Equal:     key_code = WXK_NUMPAD_EQUAL;  break;
+        case GDK_KP_Multiply:  key_code = WXK_NUMPAD_MULTIPLY; break;
+        case GDK_KP_Add:       key_code = WXK_NUMPAD_ADD;    break;
+        case GDK_KP_Separator: key_code = WXK_NUMPAD_SEPARATOR; 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_F4:            key_code = WXK_F4;          break;
+        case GDK_F5:            key_code = WXK_F5;          break;
+        case GDK_F6:            key_code = WXK_F6;          break;
+        case GDK_F7:            key_code = WXK_F7;          break;
+        case GDK_F8:            key_code = WXK_F8;          break;
+        case GDK_F9:            key_code = WXK_F9;          break;
+        case GDK_F10:           key_code = WXK_F10;         break;
+        case GDK_F11:           key_code = WXK_F11;         break;
+        case GDK_F12:           key_code = WXK_F12;         break;
+        default:
+        {
+            if (keysym <= 0xFF)
+            {
+                guint upper = gdk_keyval_to_upper( (guint)keysym );
+                keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */
+                key_code = (guint)keysym;
+            }
+        }
+    }
 
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-//  EVT_CHAR(wxWindow::OnChar)
-  EVT_SIZE(wxWindow::OnSize)
-//  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-//  EVT_IDLE(wxWindow::OnIdle)
-END_EVENT_TABLE()
+    return (key_code);
+}
 
-wxWindow::wxWindow()
+static long map_to_wx_keysym( KeySym keysym )
 {
-  m_widget = NULL;
-  m_wxwindow = NULL;
-  m_parent = NULL;
-  m_children.DeleteContents( FALSE );
-  m_x = 0;
-  m_y = 0;
-  m_width = 0;
-  m_height = 0;
-  m_retCode = 0;
-  m_eventHandler = this;
-  m_windowValidator = NULL;
-  m_windowId = -1;
-  m_cursor = new wxCursor( wxCURSOR_ARROW );
-  m_font = *wxSWISS_FONT;
-  m_windowStyle = 0;
-  m_windowName = "noname";
-  m_constraints = NULL;
-  m_constraintsInvolvedIn = NULL;
-  m_windowSizer = NULL;
-  m_sizerParent = NULL;
-  m_autoLayout = FALSE;
-  m_sizeSet = FALSE;
-  m_hasVMT = FALSE;
-  m_needParent = TRUE;
-  m_hasScrolling = FALSE;
-  m_hAdjust = NULL;
-  m_vAdjust = NULL;
-  m_oldHorizontalPos = 0.0;
-  m_oldVerticalPos = 0.0;
-  m_isShown = FALSE;
-  m_isEnabled = TRUE;
-  m_drawingOffsetX = 0;
-  m_drawingOffsetY = 0;
-  m_pDropTarget = NULL;
-};
+    guint key_code = 0;
 
-wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
+    switch (keysym)
+    {
+        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_ISO_Left_Tab:
+        case GDK_Tab:           key_code = WXK_TAB;         break;
+        case GDK_Linefeed:      key_code = WXK_RETURN;      break;
+        case GDK_Clear:         key_code = WXK_CLEAR;       break;
+        case GDK_Return:        key_code = WXK_RETURN;      break;
+        case GDK_Pause:         key_code = WXK_PAUSE;       break;
+        case GDK_Scroll_Lock:   key_code = WXK_SCROLL;      break;
+        case GDK_Escape:        key_code = WXK_ESCAPE;      break;
+        case GDK_Delete:        key_code = WXK_DELETE;      break;
+        case GDK_Home:          key_code = WXK_HOME;        break;
+        case GDK_Left:          key_code = WXK_LEFT;        break;
+        case GDK_Up:            key_code = WXK_UP;          break;
+        case GDK_Right:         key_code = WXK_RIGHT;       break;
+        case GDK_Down:          key_code = WXK_DOWN;        break;
+        case GDK_Prior:         key_code = WXK_PRIOR;       break;
+//      case GDK_Page_Up:       key_code = WXK_PAGEUP;      break;
+        case GDK_Next:          key_code = WXK_NEXT;        break;
+//      case GDK_Page_Down:     key_code = WXK_PAGEDOWN;    break;
+        case GDK_End:           key_code = WXK_END;         break;
+        case GDK_Begin:         key_code = WXK_HOME;        break;
+        case GDK_Select:        key_code = WXK_SELECT;      break;
+        case GDK_Print:         key_code = WXK_PRINT;       break;
+        case GDK_Execute:       key_code = WXK_EXECUTE;     break;
+        case GDK_Insert:        key_code = WXK_INSERT;      break;
+        case GDK_Num_Lock:      key_code = WXK_NUMLOCK;     break;
+
+        case GDK_KP_0:         key_code = '0';      break;
+        case GDK_KP_1:         key_code = '1';      break;
+        case GDK_KP_2:         key_code = '2';      break;
+        case GDK_KP_3:         key_code = '3';      break;
+        case GDK_KP_4:         key_code = '4';      break;
+        case GDK_KP_5:         key_code = '5';      break;
+        case GDK_KP_6:         key_code = '6';      break;
+        case GDK_KP_7:         key_code = '7';      break;
+        case GDK_KP_8:         key_code = '8';      break;
+        case GDK_KP_9:         key_code = '9';      break;
+        case GDK_KP_Space:     key_code = ' ';      break;
+        case GDK_KP_Tab:       key_code = WXK_TAB;    break;        /* or '\t' ??? */
+        case GDK_KP_Enter:     key_code = WXK_RETURN; break;        /* or '\r' ??? */
+        case GDK_KP_F1:        key_code = WXK_NUMPAD_F1;    break;
+        case GDK_KP_F2:        key_code = WXK_NUMPAD_F2;    break;
+        case GDK_KP_F3:        key_code = WXK_NUMPAD_F3;    break;
+        case GDK_KP_F4:        key_code = WXK_NUMPAD_F4;    break;
+        case GDK_KP_Home:      key_code = WXK_HOME;  break;
+        case GDK_KP_Left:      key_code = WXK_LEFT;  break;
+        case GDK_KP_Up:        key_code = WXK_UP;    break;
+        case GDK_KP_Right:     key_code = WXK_RIGHT; break;
+        case GDK_KP_Down:      key_code = WXK_DOWN;  break;
+        case GDK_KP_Prior:     key_code = WXK_PRIOR; break;
+//      case GDK_KP_Page_Up:   key_code = WXK_PAGEUP; break;
+        case GDK_KP_Next:      key_code = WXK_NEXT;  break;
+//      case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break;
+        case GDK_KP_End:       key_code = WXK_END;    break;
+        case GDK_KP_Begin:     key_code = WXK_HOME;   break;
+        case GDK_KP_Insert:    key_code = WXK_INSERT; break;
+        case GDK_KP_Delete:    key_code = WXK_DELETE; break;
+        case GDK_KP_Equal:     key_code = '=';   break;
+        case GDK_KP_Multiply:  key_code = '*';   break;
+        case GDK_KP_Add:       key_code = '+';   break;
+        case GDK_KP_Separator: 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_F4:            key_code = WXK_F4;          break;
+        case GDK_F5:            key_code = WXK_F5;          break;
+        case GDK_F6:            key_code = WXK_F6;          break;
+        case GDK_F7:            key_code = WXK_F7;          break;
+        case GDK_F8:            key_code = WXK_F8;          break;
+        case GDK_F9:            key_code = WXK_F9;          break;
+        case GDK_F10:           key_code = WXK_F10;         break;
+        case GDK_F11:           key_code = WXK_F11;         break;
+        case GDK_F12:           key_code = WXK_F12;         break;
+        default:
+        {
+            if (keysym <= 0xFF)
+            {
+                key_code = (guint)keysym;
+            }
+        }
+    }
+
+    return (key_code);
+}
+
+//-----------------------------------------------------------------------------
+// "expose_event" of m_wxwindow
+//-----------------------------------------------------------------------------
+
+static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win )
 {
-  Create( parent, id, pos, size, style, name );
-};
+    DEBUG_MAIN_THREAD
 
-bool wxWindow::Create( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-  m_isShown = FALSE;
-  m_isEnabled = TRUE;
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  m_widget = gtk_scrolled_window_new( NULL, NULL );
-  m_hasScrolling = TRUE;
-  
-  GtkScrolledWindow *s_window;
-  s_window = GTK_SCROLLED_WINDOW(m_widget);
-  
-  GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
-  scroll_class->scrollbar_spacing = 0;
-  
-  gtk_scrolled_window_set_policy( s_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
-    
-  m_oldHorizontalPos = 0.0;
-  m_oldVerticalPos = 0.0;
-  m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->hscrollbar) );
-  m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(s_window->vscrollbar) );
-  
-  gtk_signal_connect (GTK_OBJECT (m_hAdjust), "value_changed",
-                     (GtkSignalFunc) gtk_window_hscroll_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 );
-  
-  GtkViewport *viewport;
-  viewport = GTK_VIEWPORT(s_window->viewport);
-  
-  if (m_windowStyle & wxRAISED_BORDER)
-  {
-    gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_OUT );
-  }
-  else if (m_windowStyle & wxSUNKEN_BORDER)
-  {
-    gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_IN );
-  }
-  else
-  {
-    gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
-  };
-    
-  m_wxwindow = gtk_myfixed_new();
-  
-  if (m_windowStyle & wxTAB_TRAVERSAL == wxTAB_TRAVERSAL)
-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-  else
-    GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    if (!win->m_hasVMT)
+        return;
 
-  gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-
-  // shut the viewport up
-  gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
-  gtk_viewport_set_vadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
-  
-  // I _really_ don't want scrollbars in the beginning    
-  m_vAdjust->lower = 0.0;
-  m_vAdjust->upper = 1.0;
-  m_vAdjust->value = 0.0;
-  m_vAdjust->step_increment = 1.0;
-  m_vAdjust->page_increment = 1.0;
-  m_vAdjust->page_size = 5.0;
-  gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-  m_hAdjust->lower = 0.0;
-  m_hAdjust->upper = 1.0;
-  m_hAdjust->value = 0.0;
-  m_hAdjust->step_increment = 1.0;
-  m_hAdjust->page_increment = 1.0;
-  m_hAdjust->page_size = 5.0;
-  gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-  
-  gtk_widget_show( m_wxwindow );
-  
-  PostCreation();
-  
-  Show( TRUE );
-
-  return TRUE;  
-};
-
-wxWindow::~wxWindow(void)
-{
-  m_hasVMT = FALSE;
-  
-  if (m_pDropTarget) delete m_pDropTarget;
-  
-  if (m_parent) m_parent->RemoveChild( this );
-  if (m_widget) Show( FALSE );
-
-  DestroyChildren();
-  
-  if (m_wxwindow) gtk_widget_destroy( m_wxwindow );
-    
-  if (m_widget) gtk_widget_destroy( m_widget );
-  
-//  delete m_cursor;
+    win->GetUpdateRegion().Union( gdk_event->area.x,
+                                  gdk_event->area.y,
+                                  gdk_event->area.width,
+                                  gdk_event->area.height );
 
-  DeleteRelatedConstraints();
-  if (m_constraints)
-  {
-    // This removes any dangling pointers to this window
-    // in other windows' constraintsInvolvedIn lists.
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-    m_constraints = NULL;
-  }
-  if (m_windowSizer)
-  {
-    delete m_windowSizer;
-    m_windowSizer = NULL;
-  }
-  // If this is a child of a sizer, remove self from parent
-  if (m_sizerParent)
-    m_sizerParent->RemoveChild((wxWindow *)this);
-
-  // Just in case the window has been Closed, but
-  // we're then deleting immediately: don't leave
-  // dangling pointers.
-  wxPendingDelete.DeleteObject(this);
-
-  // Just in case we've loaded a top-level window via
-  // wxWindow::LoadNativeDialog but we weren't a dialog
-  // class
-  wxTopLevelWindows.DeleteObject(this);
-    
-};
-
-void wxWindow::PreCreation( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      long style, const wxString &name )
-{
-  if (m_needParent && (parent == NULL))
-    wxFatalError( "Need complete parent.", name );
-
-  m_widget = NULL;
-  m_hasVMT = FALSE;
-  m_parent = parent;
-  m_children.DeleteContents( FALSE );
-  m_x = (int)pos.x;
-  m_y = (int)pos.y;
-  m_width = size.x;
-  if (m_width == -1) m_width = 20;
-  m_height = size.y;
-  if (m_height == -1) m_height = 20;
-  m_retCode = 0;
-  m_eventHandler = this;
-  m_windowValidator = NULL;
-  m_windowId = id;
-  m_sizeSet = FALSE;
-  m_cursor = new wxCursor( wxCURSOR_ARROW );
-  m_font = *wxSWISS_FONT;
-  m_backgroundColour = wxWHITE;
-  m_foregroundColour = wxBLACK;
-  m_windowStyle = style;
-  m_windowName = name;
-  m_constraints = NULL;
-  m_constraintsInvolvedIn = NULL;
-  m_windowSizer = NULL;
-  m_sizerParent = NULL;
-  m_autoLayout = FALSE;
-  m_drawingOffsetX = 0;
-  m_drawingOffsetY = 0;
-  m_pDropTarget = NULL;
-}
-
-void wxWindow::PostCreation(void)
-{
-  if (m_parent) m_parent->AddChild( this );
-  
-//  GtkStyle *style = m_widget->style;
-//  style->font = m_font.GetInternalFont( 1.0 );          // destroy old font ?
-  
-  GtkWidget *connect_widget = m_widget;
-  if (m_wxwindow) connect_widget = m_wxwindow;
-  gtk_object_set_data (GTK_OBJECT (connect_widget), "MyWxWindow", (gpointer)this );
-  
-  if (m_wxwindow)
-  {
-    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 );
-  };
-  
 /*
-  gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
-    GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this );
+    wxPrintf( "OnExpose from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        wxPrintf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( " %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 );
 */
 
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "key_press_event",
-    GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
+    if (gdk_event->count > 0)
+        return;
 
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "button_press_event",
-    GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
-    
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "button_release_event",
-    GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
-    
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "motion_notify_event",
-    GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
-    
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "focus_in_event", 
-    GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+    wxEraseEvent eevent( win->GetId() );
+    eevent.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent(eevent);
 
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "focus_out_event", 
-    GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+    wxPaintEvent event( win->GetId() );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
 
-  gtk_signal_connect( GTK_OBJECT(connect_widget), "drop_data_available_event",
-    GTK_SIGNAL_FUNC(gtk_window_drop_callback), (gpointer)this );
-      
-  // Only for cursor handling
-    
-  gtk_signal_connect( GTK_OBJECT(m_widget), "enter_notify_event", 
-    GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
-    
-  gtk_signal_connect( GTK_OBJECT(m_widget), "leave_notify_event", 
-    GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
-    
-  if (m_wxwindow)
-  {
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "enter_notify_event", 
-      GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
-      
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "leave_notify_event", 
-      GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
-  };
-  
-/*
-  // Does destroy ever get called ?
+    win->GetUpdateRegion().Clear();
+}
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "destroy_event", 
-    GTK_SIGNAL_FUNC(gtk_window_destroy_callback), (gpointer)this );
-    
-  if (m_wxwindow)
-  {
-    gtk_signal_connect( GTK_OBJECT(m_wxwindow), "destroy_event", 
-      GTK_SIGNAL_FUNC(gtk_window_destroy_callback), (gpointer)this );
-  };
-*/
-  
-  if (m_widget && m_parent) gtk_widget_realize( m_widget );
-  if (m_wxwindow) gtk_widget_realize( m_wxwindow );
-  
-  SetCursor( wxSTANDARD_CURSOR );
-  
-  m_hasVMT = TRUE;
-};
+//-----------------------------------------------------------------------------
+// "draw" of m_wxwindow
+//-----------------------------------------------------------------------------
 
-bool wxWindow::HasVMT(void)
+static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
+                                      GdkRectangle *rect, wxWindow *win )
 {
-  return m_hasVMT;
-};
+    DEBUG_MAIN_THREAD
 
-bool wxWindow::Close( bool force )
-{
-  wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-  event.SetEventObject(this);
-  event.SetForce(force);
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT)
+        return;
 
-  return GetEventHandler()->ProcessEvent(event);
-};
+    win->GetUpdateRegion().Union( rect->x, rect->y,
+                                  rect->width, rect->height );
 
-bool wxWindow::Destroy(void)
-{
-  m_hasVMT = FALSE;
-  delete this;
-  return TRUE;
-};
+/*
+    wxPrintf( "OnDraw from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( " %d %d %d %d\n", (int)rect->x,
+                                (int)rect->y,
+                                (int)rect->width,
+                                (int)rect->height );
+*/
 
-bool wxWindow::DestroyChildren(void)
-{
-  if (GetChildren()) 
-  {
-    wxNode *node;
-    while ((node = GetChildren()->First()) != (wxNode *)NULL) 
-    {
-      wxWindow *child;
-      if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) 
-      {
-        delete child;
-       if (GetChildren()->Member(child)) delete node;
-      };
-    };
-  };
-  return TRUE;
-};
-
-void wxWindow::PrepareDC( wxDC &WXUNUSED(dc) )
-{
-  // are we to set fonts here ?
-};
-
-void wxWindow::ImplementSetSize(void)
-{ 
-  gtk_widget_set_usize( m_widget, m_width, m_height );
-};
-
-void wxWindow::ImplementSetPosition(void)
-{
-  if ((m_parent) && (m_parent->m_wxwindow))
-    gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y );
-  else
-    gtk_widget_set_uposition( m_widget, m_x, m_y );
-};
-
-void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags )
-{
-  int newX = x;
-  int newY = y;
-  int newW = width;
-  int newH = height;
-  
-  if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
-  {
-    if (newX == -1) newX = m_x;
-    if (newY == -1) newY = m_y;
-    if (newW == -1) newW = m_width;
-    if (newH == -1) newH = m_height;
-  };
-  
-  if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
-  {
-    if (newW == -1) newW = 80;
-  };
-  
-  if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
-  {
-    if (newH == -1) newH = 26;
-  };
-  
-  if ((m_x != newX) || (m_y != newY) || (!m_sizeSet))
-  {
-    m_x = newX;
-    m_y = newY;
-    ImplementSetPosition();
-  };
-  if ((m_width != newW) || (m_height != newH) || (!m_sizeSet))
-  {
-    m_width = newW;
-    m_height = newH;
-    ImplementSetSize();
-  };
-  m_sizeSet = TRUE;
-  
-  wxSizeEvent event( wxSize(m_width,m_height), GetId() );
-  event.SetEventObject( this );
-  ProcessEvent( event );
-};
+    wxEraseEvent eevent( win->GetId() );
+    eevent.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent(eevent);
 
-void wxWindow::SetSize( int width, int height )
-{
-  SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING );
-};
+    wxPaintEvent event( win->GetId() );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
 
-void wxWindow::Move( int x, int y )
-{
-  SetSize( x, y, -1, -1, wxSIZE_USE_EXISTING );
-};
+    win->GetUpdateRegion().Clear();
+}
 
-void wxWindow::GetSize( int *width, int *height ) const
-{
-  (*width) = m_width;
-  (*height) = m_height;
-};
+//-----------------------------------------------------------------------------
+// "key_press_event" from any window
+//-----------------------------------------------------------------------------
 
-void wxWindow::SetClientSize( int width, int height )
+static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
 {
-  if (!m_wxwindow)
-  {
-    SetSize( width, height );
-  }
-  else
-  {
-    int dw = 0;
-    int dh = 0;
-    
-    if (!m_hasScrolling)
-    {
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
 /*
-      do we have sunken dialogs ?
-      
-      GtkStyleClass *window_class = m_wxwindow->style->klass;
-    
-      dw += 2 * window_class->xthickness;
-      dh += 2 * window_class->ythickness;
+    wxString tmp;
+    tmp += (char)gdk_event->keyval;
+    printf( "KeyDown-Code is: %s.\n", tmp.c_str() );
+    printf( "KeyDown-ScanCode is: %d.\n", gdk_event->keyval );
 */
+    
+    int x = 0;
+    int y = 0;
+    GdkModifierType 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->keyval );
+    /* sending unknown key events doesn't really make sense */
+    if (key_code == 0) return FALSE;
+
+    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.m_altDown = (gdk_event->state & GDK_MOD1_MASK);
+    event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK);
+    event.m_keyCode = key_code;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;
+    event.SetEventObject( win );
+    ret = win->GetEventHandler()->ProcessEvent( event );
+
+#if wxUSE_ACCEL
+    if (!ret)
+    {
+        wxWindow *ancestor = win;
+        while (ancestor)
+        {
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)
+            {
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
+                break;
+            }
+            if (ancestor->m_isFrame)
+                break;
+            ancestor = ancestor->GetParent();
+        }
     }
-    else
+#endif // wxUSE_ACCEL
+
+    /* wxMSW doesn't send char events with Alt pressed */
+    /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
+       will only be sent if it is not in an accelerator table. */
+    key_code = map_to_wx_keysym( gdk_event->keyval );
+
+    if ( (!ret) &&
+         (key_code != 0))
     {
-      GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-      GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
-    
-      GtkWidget *viewport = scroll_window->viewport;
-      GtkStyleClass *viewport_class = viewport->style->klass;
-    
-      GtkWidget *hscrollbar = scroll_window->hscrollbar;
-      GtkWidget *vscrollbar = scroll_window->vscrollbar;
-    
-      if ((m_windowStyle & wxRAISED_BORDER) ||
-          (m_windowStyle & wxSUNKEN_BORDER)
-        )
-      {
-        dw += 2 * viewport_class->xthickness;
-        dh += 2 * viewport_class->ythickness;
-      };
-    
-      if (GTK_WIDGET_VISIBLE(vscrollbar))
-      {
-        dw += vscrollbar->allocation.width;
-        dw += scroll_class->scrollbar_spacing;
-      };
-    
-      if (GTK_WIDGET_VISIBLE(hscrollbar))
-      {
-        dh += hscrollbar->allocation.height;
-        dw += scroll_class->scrollbar_spacing;
-      };
-    };
-    
-    SetSize( width+dw, height+dh );
-  };
-};
+        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 = win->GetEventHandler()->ProcessEvent( event2 );
+    }
 
-void wxWindow::GetClientSize( int *width, int *height ) const
-{
-  if (!m_wxwindow)
-  {
-    if (width) (*width) = m_width;
-    if (height) (*height) = m_height;
-  }
-  else
-  {
-    int dw = 0;
-    int dh = 0;
-    
-    if (!m_hasScrolling)
+    /* win is a control: tab can be propagated up */
+    if ( (!ret) &&
+         ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
+         (!win->HasFlag(wxTE_PROCESS_TAB)) &&
+         (win->GetParent()) &&
+         (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
     {
-/*
-      do we have sunken dialogs ?
-      
-      GtkStyleClass *window_class = m_wxwindow->style->klass;
-    
-      dw += 2 * window_class->xthickness;
-      dh += 2 * window_class->ythickness;
-*/
+        wxNavigationKeyEvent new_event;
+        new_event.SetEventObject( 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 );
     }
-    else
+
+    /* generate wxID_CANCEL if <esc> has been pressed (typically in dialogs) */
+    if ( (!ret) &&
+         (gdk_event->keyval == GDK_Escape) )
     {
-      GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-      GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
-    
-      GtkWidget *viewport = scroll_window->viewport;
-      GtkStyleClass *viewport_class = viewport->style->klass;
-    
-      GtkWidget *hscrollbar = scroll_window->hscrollbar;
-      GtkWidget *vscrollbar = scroll_window->vscrollbar;
-    
-      if ((m_windowStyle & wxRAISED_BORDER) ||
-          (m_windowStyle & wxSUNKEN_BORDER)
-        )
-      {
-        dw += 2 * viewport_class->xthickness;
-        dh += 2 * viewport_class->ythickness;
-      };
+        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 ( (!ret) &&
+         (gdk_event->keyval == GDK_F10) )
+    {
+        wxWindow *ancestor = win;
+        while (ancestor)
+        {
+            if (wxIsKindOf(ancestor,wxFrame))
+            {
+                wxFrame *frame = (wxFrame*) ancestor;
+                wxMenuBar *menubar = frame->GetMenuBar();
+                if (menubar)
+                {
+                    wxNode *node = menubar->GetMenus().First();
+                    if (node)
+                    {
+                        wxMenu *firstMenu = (wxMenu*) node->Data();
+                        gtk_menu_item_select( GTK_MENU_ITEM(firstMenu->m_owner) );
+                        ret = TRUE;
+                        break;
+                    }
+                }
+            }
+            ancestor = ancestor->GetParent();
+        }
+    }
+*/
+#endif
+
+    if (ret)
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "key_release_event" from any window
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        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->keyval );
+
+    /* 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);
+
+    wxKeyEvent event( wxEVT_KEY_UP );
+    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_keyCode = key_code;
+    event.m_scanCode = gdk_event->keyval;
+    event.m_x = x;
+    event.m_y = y;
+    event.SetEventObject( win );
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_release_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+/*
+    wxPrintf( wxT("1) OnButtonPress from ") );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        wxPrintf( win->GetClassInfo()->GetClassName() );
+    wxPrintf( wxT(".\n") );
+*/
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return TRUE;
+    if (g_blockEventsOnScroll) return TRUE;
+
+    if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
+
+    if (win->m_wxwindow)
+    {
+        if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow) && !GTK_WIDGET_HAS_FOCUS (win->m_wxwindow) )
+        {
+            gtk_widget_grab_focus (win->m_wxwindow);
+
+/*
+            wxPrintf( wxT("GrabFocus from ") );
+            if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+                wxPrintf( win->GetClassInfo()->GetClassName() );
+            wxPrintf( wxT(".\n") );
+*/
+
+        }
+    }
+
+    wxEventType event_type = wxEVT_LEFT_DOWN;
+
+    if (gdk_event->button == 1)
+    {
+        switch (gdk_event->type)
+        {
+            case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; break;
+            case GDK_2BUTTON_PRESS: event_type = wxEVT_LEFT_DCLICK; break;
+            default:  break;
+        }
+    }
+    else if (gdk_event->button == 2)
+    {
+        switch (gdk_event->type)
+        {
+            case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break;
+            case GDK_2BUTTON_PRESS: event_type = wxEVT_MIDDLE_DCLICK; break;
+            default:  break;
+        }
+    }
+    else if (gdk_event->button == 3)
+    {
+        switch (gdk_event->type)
+        {
+            case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break;
+            case GDK_2BUTTON_PRESS: event_type = wxEVT_RIGHT_DCLICK; break;
+            default:  break;
+        }
+    }
+
+    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 = (wxCoord)gdk_event->x;
+    event.m_y = (wxCoord)gdk_event->y;
+
+    // Some control don't have their own X window and thus cannot get
+    // any events.
+
+    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)
+        {
+            wxWindow *child = (wxWindow*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
+
+            if (child->m_isStaticBox)
+            {
+                // wxStaticBox is transparent in the box itself
+                int xx1 = child->m_x;
+                int yy1 = child->m_y;
+                int xx2 = child->m_x + child->m_width;
+                int yy2 = child->m_x + child->m_height;
+
+                // left
+                if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+                // right
+                    ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+                // top
+                    ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+                // bottom
+                    ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+                {
+                    win = child;
+                    event.m_x -= child->m_x;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+
+            }
+            else
+            {
+                if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+                    (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;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+            }
+        }
+    }
+
+    event.SetEventObject( win );
+
+    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" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnScroll) return FALSE;
+
+    if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
+
+/*
+    printf( "OnButtonRelease from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+
+    wxEventType event_type = wxEVT_NULL;
+
+    switch (gdk_event->button)
+    {
+        case 1: event_type = wxEVT_LEFT_UP; break;
+        case 2: event_type = wxEVT_MIDDLE_UP; break;
+        case 3: event_type = wxEVT_RIGHT_UP; break;
+    }
+
+    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 = (wxCoord)gdk_event->x;
+    event.m_y = (wxCoord)gdk_event->y;
+
+    // Some control don't have their own X window and thus cannot get
+    // any events.
+
+    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)
+        {
+            wxWindow *child = (wxWindow*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
+
+            if (child->m_isStaticBox)
+            {
+                // wxStaticBox is transparent in the box itself
+                int xx1 = child->m_x;
+                int yy1 = child->m_y;
+                int xx2 = child->m_x + child->m_width;
+                int yy2 = child->m_x + child->m_height;
+
+                // left
+                if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+                // right
+                    ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+                // top
+                    ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+                // bottom
+                    ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+                {
+                    win = child;
+                    event.m_x -= child->m_x;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+
+            }
+            else
+            {
+                if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+                    (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;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+            }
+        }
+    }
+
+    event.SetEventObject( win );
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "motion_notify_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnScroll) return FALSE;
+
+    if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE;
+
+    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;
+    }
+
+/*
+    printf( "OnMotion from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+      printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+
+    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);
+
+    event.m_x = (wxCoord)gdk_event->x;
+    event.m_y = (wxCoord)gdk_event->y;
+
+    // Some control don't have their own X window and thus cannot get
+    // any events.
+
+    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)
+        {
+            wxWindow *child = (wxWindow*)node->Data();
+
+            node = node->Next();
+            if (!child->IsShown())
+                continue;
+
+            if (child->m_isStaticBox)
+            {
+                // wxStaticBox is transparent in the box itself
+                int xx1 = child->m_x;
+                int yy1 = child->m_y;
+                int xx2 = child->m_x + child->m_width;
+                int yy2 = child->m_x + child->m_height;
+
+                // left
+                if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) ||
+                // right
+                    ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) ||
+                // top
+                    ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) ||
+                // bottom
+                    ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2)))
+                {
+                    win = child;
+                    event.m_x -= child->m_x;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+
+            }
+            else
+            {
+                if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+                    (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;
+                    event.m_y -= child->m_y;
+                    break;
+                }
+            }
+        }
+    }
+
+    event.SetEventObject( win );
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "focus_in_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        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, synthtize 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_focusWindow = win;
+
+/*
+    printf( "OnSetFocus from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( "   " );
+    printf( WXSTRINGCAST win->GetLabel() );
+    printf( ".\n" );
+*/
+
+    wxPanel *panel = wxDynamicCast(win->GetParent(), wxPanel);
+    if (panel)
+    {
+        panel->SetLastFocus(win);
+    }
+
+#ifdef HAVE_XIM
+    if (win->m_ic)
+        gdk_im_begin(win->m_ic, win->m_wxwindow->window);
+#endif
+
+    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;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "focus_out_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return FALSE;
+    if (g_blockEventsOnDrag) return FALSE;
+
+    // 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;
+
+    g_focusWindow = (wxWindow *)NULL;
+
+/*
+    printf( "OnKillFocus from " );
+    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+        printf( win->GetClassInfo()->GetClassName() );
+    printf( ".\n" );
+*/
+
+#ifdef HAVE_XIM
+    if (win->m_ic)
+        gdk_im_end();
+#endif
+
+    wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
+    event.SetEventObject( win );
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "enter_notify_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
+{
+    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;
+
+    wxMouseEvent event( wxEVT_ENTER_WINDOW );
+#if (GTK_MINOR_VERSION > 0)
+    event.SetTimestamp( gdk_event->time );
+#endif
+    event.SetEventObject( win );
+
+    int x = 0;
+    int y = 0;
+    GdkModifierType state = (GdkModifierType)0;
+
+    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 = x;
+    event.m_y = y;
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+       gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "enter_notify_event" );
+       return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "leave_notify_event"
+//-----------------------------------------------------------------------------
+
+static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win )
+{
+    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;
+
+    wxMouseEvent event( wxEVT_LEAVE_WINDOW );
+#if (GTK_MINOR_VERSION > 0)
+    event.SetTimestamp( gdk_event->time );
+#endif
+    event.SetEventObject( win );
+
+    int x = 0;
+    int y = 0;
+    GdkModifierType state = (GdkModifierType)0;
+
+    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 = x;
+    event.m_y = y;
+
+    if (win->GetEventHandler()->ProcessEvent( event ))
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "leave_notify_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "value_changed" from m_vAdjust
+//-----------------------------------------------------------------------------
+
+static void gtk_window_vscroll_callback( GtkAdjustment *adjust, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return;
+
+    if (!win->m_hasVMT) return;
+
+    float diff = adjust->value - win->m_oldVerticalPos;
+    if (fabs(diff) < 0.2) return;
+
+    win->m_oldVerticalPos = adjust->value;
+
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+    GtkRange *range = GTK_RANGE( scrolledWindow->vscrollbar );
+
+    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)(adjust->value+0.5);
+
+    wxScrollWinEvent event( command, value, wxVERTICAL );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// "value_changed" from m_hAdjust
+//-----------------------------------------------------------------------------
+
+static void gtk_window_hscroll_callback( GtkAdjustment *adjust, wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return;
+    if (!win->m_hasVMT) return;
+
+    float diff = adjust->value - win->m_oldHorizontalPos;
+    if (fabs(diff) < 0.2) return;
+
+    win->m_oldHorizontalPos = adjust->value;
+
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
+    GtkRange *range = GTK_RANGE( scrolledWindow->hscrollbar );
+
+    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)(adjust->value+0.5);
+
+    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 )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return;
+    if (!win->m_hasVMT) return;
+
+    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 )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return;
+    if (!win->m_hasVMT) return;
+
+    wxEventType command = wxEVT_SCROLLWIN_THUMBTRACK;
+    int value = (int)(win->m_hAdjust->value+0.5);
+
+    wxScrollWinEvent event( command, value, wxHORIZONTAL );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget),
+                                                 GdkEventButton *WXUNUSED(gdk_event),
+                                                 wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+//  don't test here as we can release the mouse while being over
+//  a different window than the slider
+//
+//    if (gdk_event->window != widget->slider) return FALSE;
+
+    win->SetScrolling( TRUE );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_release_event" from scrollbar
+//-----------------------------------------------------------------------------
+
+static gint gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
+                                                   GdkEventButton *WXUNUSED(gdk_event),
+                                                   wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+
+//  don't test here as we can release the mouse while being over
+//  a different window than the slider
+//
+//    if (gdk_event->window != widget->slider) return FALSE;
+
+    win->SetScrolling( FALSE );
+
+    return FALSE;
+}
+
+// ----------------------------------------------------------------------------
+// this wxWindowBase function is implemented here (in platform-specific file)
+// because it is static and so couldn't be made virtual
+// ----------------------------------------------------------------------------
+
+wxWindow *wxWindowBase::FindFocus()
+{
+    return g_focusWindow;
+}
+
+//-----------------------------------------------------------------------------
+// "realize" from m_widget
+//-----------------------------------------------------------------------------
+
+/* We cannot set colours and fonts before the widget has
+   been realized, so we do this directly after realization. */
+
+static gint
+gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
+{
+    DEBUG_MAIN_THREAD
+
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    if (win->m_delayedBackgroundColour)
+        win->SetBackgroundColour( win->GetBackgroundColour() );
+
+    if (win->m_delayedForegroundColour)
+        win->SetForegroundColour( win->GetForegroundColour() );
+
+    wxWindowCreateEvent event( win );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+
+#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),
+                                 wxFrame * 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),
+                                wxWindow * 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
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// InsertChild for wxWindow.
+//-----------------------------------------------------------------------------
+
+/* Callback for wxWindow. 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... */
+
+static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child )
+{
+    /* 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 );
+}
+
+//-----------------------------------------------------------------------------
+// global functions
+//-----------------------------------------------------------------------------
+
+wxWindow* wxGetActiveWindow()
+{
+    return g_focusWindow;
+}
+
+//-----------------------------------------------------------------------------
+// wxWindow
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+
+void wxWindow::Init()
+{
+    // common init
+    InitBase();
+
+    // GTK specific
+    m_widget = (GtkWidget *) NULL;
+    m_wxwindow = (GtkWidget *) NULL;
+
+    // position/size
+    m_x = 0;
+    m_y = 0;
+    m_width = 0;
+    m_height = 0;
+
+    m_sizeSet = FALSE;
+    m_hasVMT = FALSE;
+    m_needParent = TRUE;
+    m_isBeingDeleted = FALSE;
+
+    m_noExpose = FALSE;
+    m_nativeSizeEvent = FALSE;
+
+    m_hasScrolling = FALSE;
+    m_isScrolling = FALSE;
+
+    m_hAdjust = (GtkAdjustment*) NULL;
+    m_vAdjust = (GtkAdjustment*) NULL;
+    m_oldHorizontalPos = 0.0;
+    m_oldVerticalPos = 0.0;
+
+    m_resizing = FALSE;
+    m_widgetStyle = (GtkStyle*) NULL;
+
+    m_insertCallback = (wxInsertChildFunction) NULL;
+
+    m_isStaticBox = FALSE;
+    m_isRadioButton = FALSE;
+    m_isFrame = FALSE;
+    m_acceptsFocus = FALSE;
+
+    m_cursor = *wxSTANDARD_CURSOR;
     
-      if (GTK_WIDGET_VISIBLE(vscrollbar))
-      {
-//        dw += vscrollbar->allocation.width;
-        dw += 15;                               // range.slider_width = 11 + 2*2pts edge
-        dw += scroll_class->scrollbar_spacing;
-      };
+#ifdef HAVE_XIM
+    m_ic = (GdkIC*) NULL;
+    m_icattr = (GdkICAttr*) NULL;
+#endif
+}
+
+wxWindow::wxWindow()
+{
+    Init();
+}
+
+wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
+                    const wxPoint &pos, const wxSize &size,
+                    long style, const wxString &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  )
+{
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxWindow 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 );
+
+#ifdef __WXDEBUG__
+    debug_focus_in( m_widget, wxT("wxWindow::m_widget"), name );
+#endif
+
+    GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
+
+#ifdef __WXDEBUG__
+    debug_focus_in( scrolledWindow->hscrollbar, wxT("wxWindow::hsrcollbar"), name );
+    debug_focus_in( scrolledWindow->vscrollbar, wxT("wxWindow::vsrcollbar"), name );
+#endif
+
+    GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+    scroll_class->scrollbar_spacing = 0;
+
+    gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+
+    m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->hscrollbar) );
+    m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->vscrollbar) );
+
+    m_wxwindow = gtk_pizza_new();
+
+#ifdef __WXDEBUG__
+    debug_focus_in( m_wxwindow, wxT("wxWindow::m_wxwindow"), name );
+#endif
+
+    gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
+
+#if (GTK_MINOR_VERSION > 0)
+    GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
+
+    if (HasFlag(wxRAISED_BORDER))
+    {
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_OUT );
+    }
+    else if (HasFlag(wxSUNKEN_BORDER))
+    {
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_IN );
+    }
+    else if (HasFlag(wxSIMPLE_BORDER))
+    {
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_THIN );
+    }
+    else
+    {
+        gtk_pizza_set_shadow_type( pizza, GTK_MYSHADOW_NONE );
+    }
+#else // GTK_MINOR_VERSION == 0
+    GtkViewport *viewport = GTK_VIEWPORT(scrolledWindow->viewport);
+
+    if (HasFlag(wxRAISED_BORDER))
+    {
+        gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_OUT );
+    }
+    else if (HasFlag(wxSUNKEN_BORDER))
+    {
+        gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_IN );
+    }
+    else
+    {
+        gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE );
+    }
+#endif // GTK_MINOR_VERSION
+
+    GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    m_acceptsFocus = TRUE;
+
+#if (GTK_MINOR_VERSION == 0)
+    // shut the viewport up
+    gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
+    gtk_viewport_set_vadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) );
+#endif // GTK_MINOR_VERSION == 0
+
+    // I _really_ don't want scrollbars in the beginning
+    m_vAdjust->lower = 0.0;
+    m_vAdjust->upper = 1.0;
+    m_vAdjust->value = 0.0;
+    m_vAdjust->step_increment = 1.0;
+    m_vAdjust->page_increment = 1.0;
+    m_vAdjust->page_size = 5.0;
+    gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+    m_hAdjust->lower = 0.0;
+    m_hAdjust->upper = 1.0;
+    m_hAdjust->value = 0.0;
+    m_hAdjust->step_increment = 1.0;
+    m_hAdjust->page_increment = 1.0;
+    m_hAdjust->page_size = 5.0;
+    gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+
+    // these handlers block mouse events to any window during scrolling such as
+    // motion events and prevent GTK and wxWindows from fighting over where the
+    // slider should be
+
+    gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
+          (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+    gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_press_event",
+          (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
+
+    gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_release_event",
+          (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+
+    gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event",
+          (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+
+    // these handlers get notified when screen updates are required either when
+    // scrolling or when the window size (and therefore scrollbar configuration)
+    // has changed
+
+    gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
+          (GtkSignalFunc) gtk_window_hscroll_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 );
+
+    PostCreation();
+
+    Show( TRUE );
+
+    return TRUE;
+}
+
+wxWindow::~wxWindow()
+{
+    m_isBeingDeleted = TRUE;
+    m_hasVMT = FALSE;
+
+    if (m_widget)
+        Show( FALSE );
+
+    DestroyChildren();
+
+    if (m_parent)
+        m_parent->RemoveChild( this );
+
+#ifdef HAVE_XIM
+    if (m_ic)
+        gdk_ic_destroy (m_ic);
+    if (m_icattr)
+        gdk_ic_attr_destroy (m_icattr);
+#endif
+
+    if (m_widgetStyle)
+    {
+        gtk_style_unref( m_widgetStyle );
+        m_widgetStyle = (GtkStyle*) NULL;
+    }
+
+    if (m_wxwindow)
+    {
+        gtk_widget_destroy( m_wxwindow );
+        m_wxwindow = (GtkWidget*) NULL;
+    }
+
+    if (m_widget)
+    {
+        gtk_widget_destroy( m_widget );
+        m_widget = (GtkWidget*) NULL;
+    }
+}
+
+bool wxWindow::PreCreation( wxWindow *parent, const wxPoint &pos,  const wxSize &size )
+{
+    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;
+
+    /* some reasonable defaults */
+    if (!parent)
+    {
+        if (m_x == -1)
+        {
+            m_x = (gdk_screen_width () - m_width) / 2;
+            if (m_x < 10) m_x = 10;
+        }
+        if (m_y == -1)
+        {
+            m_y = (gdk_screen_height () - m_height) / 2;
+            if (m_y < 10) m_y = 10;
+        }
+    }
+
+    return TRUE;
+}
+
+void wxWindow::PostCreation()
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+
+    if (m_wxwindow)
+    {
+        if (!m_noExpose)
+        {
+            /* these get reported to wxWindows -> wxPaintEvent */
+            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 (GTK_MINOR_VERSION > 0)
+        /* 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 );
+#endif
+    }
+
+    if (m_wxwindow && m_needParent)
+    {
+        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "focus_in_event",
+            GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+
+        gtk_signal_connect( GTK_OBJECT(m_wxwindow), "focus_out_event",
+            GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+    }
+    else
+    {
+        // For dialogs and frames, we are interested mainly in
+       // m_widget's focus.
+       
+        gtk_signal_connect( GTK_OBJECT(m_widget), "focus_in_event",
+            GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+
+        gtk_signal_connect( GTK_OBJECT(m_widget), "focus_out_event",
+            GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+    }
+
+    GtkWidget *connect_widget = GetConnectWidget();
+
+    ConnectWidget( connect_widget );
+
+    /* 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",
+                            GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this );
+    if (m_wxwindow)
+    {
+        /* 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_WIDGET_VISIBLE(hscrollbar))
-      {
-//        dh += hscrollbar->allocation.height;
-        dh += 15;
-        dh += scroll_class->scrollbar_spacing;
-      };
-    };
+    m_hasVMT = TRUE;
+}
+
+void wxWindow::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_release_event",
+      GTK_SIGNAL_FUNC(gtk_window_key_release_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(widget), "button_press_event",
+      GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(widget), "button_release_event",
+      GTK_SIGNAL_FUNC(gtk_window_button_release_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), "enter_notify_event",
+      GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event",
+      GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
+}
+
+bool wxWindow::Destroy()
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+
+    m_hasVMT = FALSE;
+
+    return wxWindowBase::Destroy();
+}
+
+void wxWindow::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 );
+}
     
-    if (width) (*width) = m_width - dw;
-    if (height) (*height) = m_height - dh;
-  };
-};
+void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags )
+{
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
+    wxASSERT_MSG( (m_parent != NULL), wxT("wxWindow::SetSize requires parent.\n") );
+
+    if (m_resizing) return; /* I don't like recursions */
+    m_resizing = TRUE;
+
+    if (m_parent->m_wxwindow == NULL) /* i.e. wxNotebook */
+    {
+        /* don't set the size for children of wxNotebook, just take the values. */
+        m_x = x;
+        m_y = y;
+        m_width = width;
+        m_height = height;
+    }
+    else
+    {
+        GtkPizza *pizza = GTK_PIZZA(m_parent->m_wxwindow);
+
+        if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
+        {
+            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
+        {
+            m_x = x + pizza->xoffset;
+            m_y = y + pizza->yoffset;
+            m_width = width;
+            m_height = height;
+        }
+
+        if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
+        {
+             if (width == -1) m_width = 80;
+        }
+
+        if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT)
+        {
+             if (height == -1) m_height = 26;
+        }
+
+        if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+        if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+        if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+        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))
+        {
+            /* the default button has a border around it */
+            border = 6;
+            bottom_border = 5;
+        }
 
-void wxWindow::GetPosition( int *x, int *y ) const
-{
-  if (x) (*x) = m_x;
-  if (y) (*y) = m_y;
-};
+        DoMoveWindow( m_x-border,
+                      m_y-border,
+                      m_width+2*border,
+                      m_height+border+bottom_border );
+    }
 
-void wxWindow::ClientToScreen( int *x, int *y )
-{
-  // Does this look simple ?
+/*
+    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 );
+*/
 
-  GdkWindow *source = NULL;
-  if (m_wxwindow)
-    source = m_wxwindow->window;
-  else
-    source = m_widget->window;
-    
-  int org_x = 0;
-  int org_y = 0;
-  gdk_window_get_origin( source, &org_x, &org_y );
-
-  if (!m_wxwindow)
-  {  
-    if (GTK_WIDGET_NO_WINDOW (m_widget))
-    {
-      org_x += m_widget->allocation.x;
-      org_y += m_widget->allocation.y;
-    };
-  };
-  
-  if (x) *x += org_x;  
-  if (y) *y += org_y;  
-};
-
-void wxWindow::ScreenToClient( int *x, int *y )
-{
-  GdkWindow *source = NULL;
-  if (m_wxwindow)
-    source = m_wxwindow->window;
-  else
-    source = m_widget->window;
-    
-  int org_x = 0;
-  int org_y = 0;
-  gdk_window_get_origin( source, &org_x, &org_y );
-
-  if (!m_wxwindow)
-  {  
-    if (GTK_WIDGET_NO_WINDOW (m_widget))
-    {
-      org_x += m_widget->allocation.x;
-      org_y += m_widget->allocation.y;
-    };
-  };
-  
-  if (x) *x -= org_x;  
-  if (y) *y -= org_y;  
-};
-
-void wxWindow::Centre( int direction )
-{
-  int x = 0;
-  int y = 0;
-  GetPosition( &x, &y );
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
-    if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
-    gtk_widget_set_uposition( m_widget, x, y );
-  }
-  else
-  {
-    if (m_parent)
+    if (!m_nativeSizeEvent)
     {
-      int p_w = 0;
-      int p_h = 0;
-      m_parent->GetSize( &p_w, &p_h );
-      if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (p_w - m_width) / 2;
-      if (direction & wxVERTICAL == wxVERTICAL) y = (p_h - m_height) / 2;
-      gtk_widget_set_uposition( m_widget, x, y );
-    };
-  }
-};
+        wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }
 
-void wxWindow::Fit(void)
-{
-       int maxX = 0;
-       int maxY = 0;
-       wxNode *node = GetChildren()->First();
-       while ( node )
-       {
-               wxWindow *win = (wxWindow *)node->Data();
-               int wx, wy, ww, wh;
-               win->GetPosition(&wx, &wy);
-               win->GetSize(&ww, &wh);
-               if ( wx + ww > maxX )
-                       maxX = wx + ww;
-               if ( wy + wh > maxY )
-                       maxY = wy + wh;
-
-               node = node->Next();
-       }
-       SetClientSize(maxX + 5, maxY + 5);
-};
+    m_resizing = FALSE;
+}
 
-void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) )
+void wxWindow::OnInternalIdle()
 {
-  if (GetAutoLayout()) Layout();
-};
+    if ( g_sendActivateEvent != -1 )
+    {
+        bool activate = g_sendActivateEvent != 0;
 
-bool wxWindow::Show( bool show )
-{
-  if (show)
-    gtk_widget_show( m_widget );
-  else
-    gtk_widget_hide( m_widget );
-  m_isShown = show;  
-  return TRUE;
-};
+        // do it only once
+        g_sendActivateEvent = -1;
+
+        wxActivateEvent event(wxEVT_ACTIVATE, activate, GetId());
+        event.SetEventObject(this);
+
+        (void)GetEventHandler()->ProcessEvent(event);
+    }
+
+    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();
+}
 
-void wxWindow::Enable( bool enable )
+void wxWindow::DoGetSize( int *width, int *height ) const
 {
-  m_isEnabled = enable;
-  gtk_widget_set_sensitive( m_widget, enable );
-  if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable );
-};
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (width) (*width) = m_width;
+    if (height) (*height) = m_height;
+}
 
-void wxWindow::MakeModal( bool modal )
+void wxWindow::DoSetClientSize( int width, int height )
 {
-  return;
-  // Disable all other windows
-  if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame)))
-  {
-    wxNode *node = wxTopLevelWindows.First();
-    while (node)
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (!m_wxwindow)
+    {
+        SetSize( width, height );
+    }
+    else
     {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (win != this)
-        win->Enable(!modal);
+        int dw = 0;
+        int dh = 0;
+
+        if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
+        {
+            /* when using GTK 1.2 we set the shadow border size to 2 */
+            dw += 2 * 2;
+            dh += 2 * 2;
+        }
+        if (HasFlag(wxSIMPLE_BORDER))
+        {
+            /* when using GTK 1.2 we set the simple border size to 1 */
+            dw += 1 * 2;
+            dh += 1 * 2;
+        }
+
+        if (HasScrolling())
+        {
+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+            
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->vscrollbar)->klass )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
+                
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->hscrollbar)->klass )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
+
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+
+            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;
+            }
+        }
 
-      node = node->Next();
+       SetSize( width+dw, height+dh );
     }
-  }
 }
 
-void wxWindow::SetFocus(void)
+void wxWindow::DoGetClientSize( int *width, int *height ) const
 {
-  GtkWidget *connect_widget = m_widget;
-  if (m_wxwindow) connect_widget = m_wxwindow;
-  if (connect_widget)
-  {
-    if (GTK_WIDGET_CAN_FOCUS(connect_widget) && !GTK_WIDGET_HAS_FOCUS (connect_widget) )
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (!m_wxwindow)
+    {
+        if (width) (*width) = m_width;
+        if (height) (*height) = m_height;
+    }
+    else
     {
-      gtk_widget_grab_focus (connect_widget);
-    };
-  };
-};
+        int dw = 0;
+        int dh = 0;
+
+        if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
+        {
+            /* when using GTK 1.2 we set the shadow border size to 2 */
+            dw += 2 * 2;
+            dh += 2 * 2;
+        }
+        if (HasFlag(wxSIMPLE_BORDER))
+        {
+            /* when using GTK 1.2 we set the simple border size to 1 */
+            dw += 1 * 2;
+            dh += 1 * 2;
+        }
+
+        if (HasScrolling())
+        {
+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+            
+            GtkRequisition vscroll_req;
+            vscroll_req.width = 2;
+            vscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->vscrollbar)->klass )->size_request )
+                (scroll_window->vscrollbar, &vscroll_req );
+                
+            GtkRequisition hscroll_req;
+            hscroll_req.width = 2;
+            hscroll_req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(scroll_window->hscrollbar)->klass )->size_request )
+                (scroll_window->hscrollbar, &hscroll_req );
+
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+
+            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;
+            }
+        }
+
+        if (width) (*width) = m_width - dw;
+        if (height) (*height) = m_height - dh;
+    }
+}
 
-bool wxWindow::OnClose(void)
+void wxWindow::DoGetPosition( int *x, int *y ) const
 {
-  printf( "OnClose event.\n" );
-  return TRUE;
-};
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    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::AddChild( wxWindow *child )
+void wxWindow::DoClientToScreen( int *x, int *y ) const
 {
-  // Addchild is (often) called before the program
-  // has left the parents constructor so that no
-  // virtual tables work yet. The approach below
-  // practically imitates virtual tables, i.e. it
-  // implements a different AddChild() behaviour
-  // for wxFrame, wxDialog, wxWindow and 
-  // wxMDIParentFrame.
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
 
-  if (IsKindOf(CLASSINFO(wxMDIParentFrame)))
-  {
-    if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
+    if (!m_widget->window) return;
+
+    GdkWindow *source = (GdkWindow *) NULL;
+    if (m_wxwindow)
+        source = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        source = m_widget->window;
+
+    int org_x = 0;
+    int org_y = 0;
+    gdk_window_get_origin( source, &org_x, &org_y );
+
+    if (!m_wxwindow)
     {
-      wxMDIClientWindow *client = ((wxMDIParentFrame*)this)->GetClientWindow();
-      if (client)
-      { 
-        client->AddChild( child );
-        return;
-      };
-    };
-  };
-  
-  if (IsKindOf(CLASSINFO(wxNotebook)))
-  {
-    wxNotebook *tab = (wxNotebook*)this;
-    tab->AddChild( child );
-    return;
-  };
-  
-  m_children.Append( child );
-  if (child->IsKindOf(CLASSINFO(wxFrame)) || child->IsKindOf(CLASSINFO(wxDialog)))
-  {
-    if ((child->m_x != -1) && (child->m_y != -1))
-      gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y );
-  }
-  else
-  {
+        if (GTK_WIDGET_NO_WINDOW (m_widget))
+        {
+            org_x += m_widget->allocation.x;
+            org_y += m_widget->allocation.y;
+        }
+    }
+
+    if (x) *x += org_x;
+    if (y) *y += org_y;
+}
+
+void wxWindow::DoScreenToClient( int *x, int *y ) const
+{
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (!m_widget->window) return;
+
+    GdkWindow *source = (GdkWindow *) NULL;
     if (m_wxwindow)
-      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
-  };
-  gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
-};
+        source = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        source = m_widget->window;
+
+    int org_x = 0;
+    int org_y = 0;
+    gdk_window_get_origin( source, &org_x, &org_y );
+
+    if (!m_wxwindow)
+    {
+        if (GTK_WIDGET_NO_WINDOW (m_widget))
+        {
+            org_x += m_widget->allocation.x;
+            org_y += m_widget->allocation.y;
+        }
+    }
 
-wxList *wxWindow::GetChildren(void)
+    if (x) *x -= org_x;
+    if (y) *y -= org_y;
+}
+
+bool wxWindow::Show( bool show )
 {
-  return (&m_children);
-};
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+
+    if (!wxWindowBase::Show(show))
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    if (show)
+        gtk_widget_show( m_widget );
+    else
+        gtk_widget_hide( m_widget );
 
-void wxWindow::RemoveChild( wxWindow *child )
+    return TRUE;
+}
+
+bool wxWindow::Enable( bool enable )
 {
-  if (GetChildren())
- GetChildren()->DeleteObject( child );
-  child->m_parent = NULL;
-};
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+
+    if (!wxWindowBase::Enable(enable))
+    {
+        // nothing to do
+        return FALSE;
+    }
+
+    gtk_widget_set_sensitive( m_widget, enable );
+    if ( m_wxwindow )
+        gtk_widget_set_sensitive( m_wxwindow, enable );
+
+    return TRUE;
+}
 
-void wxWindow::SetReturnCode( int retCode )
+int wxWindow::GetCharHeight() const
 {
-  m_retCode = retCode;
-};
+    wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
+
+    wxCHECK_MSG( m_font.Ok(), 12, wxT("invalid font") );
+
+    GdkFont *font = m_font.GetInternalFont( 1.0 );
 
-int wxWindow::GetReturnCode(void)
+    return font->ascent + font->descent;
+}
+
+int wxWindow::GetCharWidth() const
 {
-  return m_retCode;
-};
+    wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
+
+    wxCHECK_MSG( m_font.Ok(), 8, wxT("invalid font") );
+
+    GdkFont *font = m_font.GetInternalFont( 1.0 );
 
-wxWindow *wxWindow::GetParent(void)
+    return gdk_string_width( font, "H" );
+}
+
+void wxWindow::GetTextExtent( const wxString& string,
+                              int *x,
+                              int *y,
+                              int *descent,
+                              int *externalLeading,
+                              const wxFont *theFont ) const
 {
-  return m_parent;
-};
+    wxFont fontToUse = m_font;
+    if (theFont) fontToUse = *theFont;
+
+    wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
+
+    GdkFont *font = fontToUse.GetInternalFont( 1.0 );
+    if (x) (*x) = gdk_string_width( font, string.mbc_str() );
+    if (y) (*y) = font->ascent + font->descent;
+    if (descent) (*descent) = font->descent;
+    if (externalLeading) (*externalLeading) = 0;  // ??
+}
 
-wxEvtHandler *wxWindow::GetEventHandler(void)
+void wxWindow::SetFocus()
 {
-  return m_eventHandler;
-};
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    
+    if (m_wxwindow)
+    {
+        if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))
+            gtk_widget_grab_focus (m_wxwindow);
+        return;
+    }
+
+    if (m_widget)
+    {
+        if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
+        {
+            gtk_widget_grab_focus (m_widget);
+        }
+        else if (GTK_IS_CONTAINER(m_widget))
+        {
+            gtk_container_focus( GTK_CONTAINER(m_widget), GTK_DIR_TAB_FORWARD );
+        }
+        else
+        {
+           // ?
+        }
+    }
+}
 
-void wxWindow::SetEventhandler( wxEvtHandler *handler )
+bool wxWindow::AcceptsFocus() const
 {
-  m_eventHandler = handler;
-};
+    return m_acceptsFocus && wxWindowBase::AcceptsFocus();
+}
 
-wxValidator *wxWindow::GetValidator(void)
+bool wxWindow::Reparent( wxWindowBase *newParentBase )
 {
-  return m_windowValidator;
-};
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+
+    wxWindow *oldParent = m_parent,
+             *newParent = (wxWindow *)newParentBase;
+
+    wxASSERT( GTK_IS_WIDGET(m_widget) );
+
+    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;
+}
 
-void wxWindow::SetValidator( wxValidator *validator )
+void wxWindow::DoAddChild(wxWindow *child)
 {
-  m_windowValidator = validator;
-};
+    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 );
 
-bool wxWindow::IsBeingDeleted(void)
+    /* insert GTK representation */
+    (*m_insertCallback)(this, child);
+}
+
+void wxWindow::Raise()
 {
-  return FALSE;
-};
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (!m_widget->window) return;
+
+    gdk_window_raise( m_widget->window );
+}
 
-void wxWindow::SetId( wxWindowID id )
+void wxWindow::Lower()
 {
-  m_windowId = id;
-};
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+
+    if (!m_widget->window) return;
+
+    gdk_window_lower( m_widget->window );
+}
 
-wxWindowID wxWindow::GetId(void)
+bool wxWindow::SetCursor( const wxCursor &cursor )
 {
-  return m_windowId;
-};
+    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
 
-void wxWindow::SetCursor( const wxCursor &cursor )
+    return wxWindowBase::SetCursor( cursor );
+}
+
+void wxWindow::WarpPointer( int x, int y )
 {
-  if (*m_cursor == cursor) return;
-  (*m_cursor) = cursor;
-  if (m_widget->window)
-    gdk_window_set_cursor( m_widget->window, m_cursor->GetCursor() );
-  if (m_wxwindow && m_wxwindow->window)
-    gdk_window_set_cursor( m_wxwindow->window, m_cursor->GetCursor() );
-};
+    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 )
 {
-  if (eraseBackground && m_wxwindow && m_wxwindow->window)
-  {
-    if (rect)
-      gdk_window_clear_area( m_wxwindow->window, 
-        rect->x, 
-       rect->y, 
-       rect->width, 
-       rect->height );
+    if (!m_widget) return;
+    if (!m_widget->window) return;
+
+    if (eraseBackground && m_wxwindow && m_wxwindow->window)
+    {
+        if (rect)
+        {
+            gdk_window_clear_area( GTK_PIZZA(m_wxwindow)->bin_window,
+                                   rect->x, rect->y,
+                                   rect->width, rect->height );
+        }
+        else
+        {
+            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)
+        {
+            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_pizza_set_clear( pizza, old_clear );
+        }
+        else
+            gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
+    }
     else
-      Clear();
-  };
-  if (!rect)
-  {
+    {
+        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)
+        {
+            GtkPizza *pizza = GTK_PIZZA(m_wxwindow);
+            gboolean old_clear = pizza->clear_on_draw;
+            gtk_pizza_set_clear( pizza, FALSE );
+
+            gtk_widget_draw( m_wxwindow, &gdk_rect );
+
+            gtk_pizza_set_clear( pizza, old_clear );
+        }
+        else
+            gtk_widget_draw( m_widget, &gdk_rect );
+    }
+}
+
+void wxWindow::Clear()
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+
+    if (!m_widget->window) return;
+
+    if (m_wxwindow && m_wxwindow->window)
+    {
+        gdk_window_clear( m_wxwindow->window );
+    }
+}
+
+#if wxUSE_TOOLTIPS
+void wxWindow::DoSetToolTip( wxToolTip *tip )
+{
+    wxWindowBase::DoSetToolTip(tip);
+
+    if (m_tooltip)
+        m_tooltip->Apply( this );
+}
+
+void wxWindow::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
+{
+    gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+}
+#endif // wxUSE_TOOLTIPS
+
+bool wxWindow::SetBackgroundColour( const wxColour &colour )
+{
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+
+    if (!wxWindowBase::SetBackgroundColour(colour))
+    {
+        // don't leave if the GTK widget has just
+        // been realized
+        if (!m_delayedBackgroundColour) return FALSE;
+    }
+
+    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
+        // but it couldn't get applied as the
+        // widget hasn't been realized yet.
+        m_delayedBackgroundColour = TRUE;
+
+        // pretend we have done something
+        return TRUE;
+    }
+
+    if ((m_wxwindow) &&
+        (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. */
+
+        m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+        gdk_window_set_background( window, m_backgroundColour.GetColor() );
+    }
+
+    ApplyWidgetStyle();
+
+    return TRUE;
+}
+
+bool wxWindow::SetForegroundColour( const wxColour &colour )
+{
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+
+    if (!wxWindowBase::SetForegroundColour(colour))
     {
-      wxClientDC dc(this);
-      PrepareDC(dc);
-      long x = 0;
-      long y = 0;
-      dc.GetInternalDeviceOrigin( &x, &y );
-      
-      int w = 0;
-      int h = 0;
-      GetClientSize( &w, &h );
-      
-      GdkRectangle gdk_rect;
-      gdk_rect.x = x;
-      gdk_rect.y = y;
-      gdk_rect.width = w;
-      gdk_rect.height = h;
-      gtk_widget_draw( m_wxwindow, &gdk_rect );
-    };
-  }
-  else
-  {
-    GdkRectangle gdk_rect;
-    gdk_rect.x = rect->x;
-    gdk_rect.y = rect->y;
-    gdk_rect.width = rect->width;
-    gdk_rect.height = rect->height;
+        // don't leave if the GTK widget has just
+        // been realized
+        if (!m_delayedForegroundColour) return FALSE;
+    }
+
+    GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
-      gtk_widget_draw( m_wxwindow, &gdk_rect );
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
     else
-      gtk_widget_draw( m_widget, &gdk_rect );
-  };
-};
-
-bool wxWindow::IsExposed( long x, long y )
-{
-  return (m_updateRegion.Contains( x, y ) != wxOutRegion );
-};
+        window = GetConnectWidget()->window;
 
-bool wxWindow::IsExposed( long x, long y, long width, long height )
-{
-  return (m_updateRegion.Contains( x, y, width, height ) != wxOutRegion );
-};
+    if (!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;
 
-void wxWindow::Clear(void)
-{
-  if (m_wxwindow && m_wxwindow->window) gdk_window_clear( m_wxwindow->window );
-};
+        // pretend we have done something
+        return TRUE;
+    }
 
-wxColour wxWindow::GetBackgroundColour(void) const
-{
-  return m_backgroundColour;
-};
+    ApplyWidgetStyle();
 
-void wxWindow::SetBackgroundColour( const wxColour &colour )
-{
-  m_backgroundColour = colour;
-  if (m_wxwindow)
-  {
-    m_backgroundColour.CalcPixel( m_wxwindow->style->colormap );
-    gdk_window_set_background( m_wxwindow->window, m_backgroundColour.GetColor() );
-    gdk_window_clear( m_wxwindow->window );
-  };
-  // do something ?
-};
+    return TRUE;
+}
 
-bool wxWindow::Validate(void)
+GtkStyle *wxWindow::GetWidgetStyle()
 {
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *child = (wxWindow *)node->Data();
-    if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this)) 
-      { return FALSE; }
-    node = node->Next();
-  };
-  return TRUE;
-};
-
-bool wxWindow::TransferDataToWindow(void)
-{
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *child = (wxWindow *)node->Data();
-    if (child->GetValidator() && /* child->GetValidator()->Ok() && */
-       !child->GetValidator()->TransferToWindow() )
-    {
-      wxMessageBox( "Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION );
-      return FALSE;
-    };
-    node = node->Next();
-  };
-  return TRUE;
-};
-
-bool wxWindow::TransferDataFromWindow(void)
-{
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *child = (wxWindow *)node->Data();
-    if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() )
-      { return FALSE; }
-   node = node->Next();
-  }
-  return TRUE;
-};
+    if (m_widgetStyle) return m_widgetStyle;
 
-void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
-{
-  TransferDataToWindow();
-};
+    GtkStyle *def = gtk_rc_get_style( m_widget );
 
-void wxWindow::InitDialog(void)
-{
-  wxInitDialogEvent event(GetId());
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
-};
+    if (!def)
+        def = gtk_widget_get_default_style();
 
-void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
-{
-  GtkWidget *connect_widget = m_widget;
-  if (m_wxwindow) connect_widget = m_wxwindow;
-  if (m_pDropTarget)
-  {
-    m_pDropTarget->UnregisterWidget( connect_widget );
-    delete m_pDropTarget;
-  };
-  m_pDropTarget = dropTarget;
-  if (m_pDropTarget)
-  {
-    m_pDropTarget->RegisterWidget( connect_widget );
-  };
-};
+    m_widgetStyle = gtk_style_copy( def );
+    m_widgetStyle->klass = def->klass;
 
-wxDropTarget *wxWindow::GetDropTarget() const
-{
-  return m_pDropTarget;
-};
+    return m_widgetStyle;
+}
 
-void wxWindow::SetFont( const wxFont &font )
+void wxWindow::SetWidgetStyle()
 {
-  m_font = font;
-/*
-  create new style
-  copy old style values to new one
-  set font in new style
-  -> takes to many resources
-  
-  GtkStyle *style = gtk_style_new();
-  ...
-*/
-};
+    GtkStyle *style = GetWidgetStyle();
 
-wxFont *wxWindow::GetFont(void)
-{
-  return &m_font;
-};
+    if (m_font != wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ))
+    {
+        gdk_font_unref( style->font );
+        style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
+    }
 
-void wxWindow::SetWindowStyleFlag( long flag )
-{
-  m_windowStyle = flag;
-};
+    if (m_foregroundColour.Ok())
+    {
+        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();
+        }
+    }
 
-long wxWindow::GetWindowStyleFlag(void) const
-{
-  return m_windowStyle;
-};
+    if (m_backgroundColour.Ok())
+    {
+        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();
+       }
+    }
+}
 
-void wxWindow::CaptureMouse(void)
+void wxWindow::ApplyWidgetStyle()
 {
-  GtkWidget *connect_widget = m_widget;
-  if (m_wxwindow) connect_widget = m_wxwindow;
-  gtk_grab_add( connect_widget );
-  gdk_pointer_grab ( connect_widget->window, FALSE,
-                    (GdkEventMask)
-                   (GDK_BUTTON_PRESS_MASK | 
-                   GDK_BUTTON_RELEASE_MASK |
-                   GDK_POINTER_MOTION_MASK), 
-                   NULL, NULL, GDK_CURRENT_TIME );
-};
+}
 
-void wxWindow::ReleaseMouse(void)
-{
-  GtkWidget *connect_widget = m_widget;
-  if (m_wxwindow) connect_widget = m_wxwindow;
-  gtk_grab_remove( connect_widget );
-  gdk_pointer_ungrab ( GDK_CURRENT_TIME );
-};
+//-----------------------------------------------------------------------------
+// Pop-up menu stuff
+//-----------------------------------------------------------------------------
 
-void wxWindow::SetTitle( const wxString &WXUNUSED(title) )
+static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting  )
 {
-};
+    *is_waiting = FALSE;
+}
 
-wxString wxWindow::GetTitle(void) const
+static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
-  return (wxString&)m_windowName;
-};
+    menu->SetInvokingWindow( win );
+    wxMenuItemList::Node *node = menu->GetMenuItems().GetFirst();
+    while (node)
+    {
+        wxMenuItem *menuitem = node->GetData();
+        if (menuitem->IsSubMenu())
+        {
+            SetInvokingWindow( menuitem->GetSubMenu(), win );
+        }
 
-wxString wxWindow::GetLabel(void) const
-{
-  return GetTitle();
-};
+        node = node->GetNext();
+    }
+}
 
-void wxWindow::SetName( const wxString &name )
-{
-  m_windowName = name;
-};
+static gint gs_pop_x = 0;
+static gint gs_pop_y = 0;
 
-wxString wxWindow::GetName(void) const
+static void pop_pos_callback( GtkMenu * WXUNUSED(menu),
+                              gint *x, gint *y,
+                              wxWindow *win )
 {
-  return (wxString&)m_windowName;
-};
+    win->ClientToScreen( &gs_pop_x, &gs_pop_y );
+    *x = gs_pop_x;
+    *y = gs_pop_y;
+}
 
-bool wxWindow::IsShown(void)
+bool wxWindow::DoPopupMenu( wxMenu *menu, int x, int y )
 {
-  return m_isShown;
-};
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
 
-bool wxWindow::IsRetained(void)
-{
-  return FALSE;
-};
+    wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
 
-wxWindow *wxWindow::FindWindow( long id )
-{
-  if (id == m_windowId) return this;
-  wxNode *node = m_children.First();
-  while (node)
-  {
-    wxWindow *child = (wxWindow*)node->Data();
-    wxWindow *res = child->FindWindow( id );
-    if (res) return res;
-    node = node->Next();
-  };
-  return NULL;
-};
-
-wxWindow *wxWindow::FindWindow( const wxString& name )
-{
-  if (name == m_windowName) return this;
-  wxNode *node = m_children.First();
-  while (node)
-  {
-    wxWindow *child = (wxWindow*)node->Data();
-    wxWindow *res = child->FindWindow( name );
-    if (res) return res;
-    node = node->Next();
-  };
-  return NULL;
-};
+    SetInvokingWindow( menu, this );
 
-void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
-      int range, bool WXUNUSED(refresh) )
-{
-  if (!m_wxwindow) return;
+    menu->UpdateUI();
 
-  if (orient == wxHORIZONTAL)
-  {
-    float fpos = (float)pos;
-    m_oldHorizontalPos = fpos;
-    float frange = (float)range;
-    float fthumb = (float)thumbVisible;
-    
-    if ((fabs(fpos-m_hAdjust->value) < 0.2) &&
-        (fabs(frange-m_hAdjust->upper) < 0.2) &&
-       (fabs(fthumb-m_hAdjust->page_size) < 0.2))
-      return;
-      
-    m_hAdjust->lower = 0.0;
-    m_hAdjust->upper = frange;
-    m_hAdjust->value = fpos;
-    m_hAdjust->step_increment = 1.0;
-    m_hAdjust->page_increment = (float)(wxMax(fthumb-2,0));
-    m_hAdjust->page_size = fthumb;
-  }
-  else
-  {
-    float fpos = (float)pos;
-    m_oldVerticalPos = fpos;
-    float frange = (float)range;
-    float fthumb = (float)thumbVisible;
-    
-    if ((fabs(fpos-m_vAdjust->value) < 0.2) &&
-        (fabs(frange-m_vAdjust->upper) < 0.2) &&
-       (fabs(fthumb-m_vAdjust->page_size) < 0.2))
-      return;
-      
-    m_vAdjust->lower = 0.0;
-    m_vAdjust->upper = frange;
-    m_vAdjust->value = fpos;
-    m_vAdjust->step_increment = 1.0;
-    m_vAdjust->page_increment = (float)(wxMax(fthumb-2,0));
-    m_vAdjust->page_size = fthumb;
-  };
-  if (m_wxwindow->window)
-  {  
-    if (orient == wxHORIZONTAL)
-      gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-    else  
-      gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-      
-//    gtk_widget_set_usize( m_widget, m_width, m_height );
-  };
-};
+    gs_pop_x = x;
+    gs_pop_y = y;
 
-void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
-{
-  if (!m_wxwindow) return;
-  
-  if (orient == wxHORIZONTAL)
-  {
-    float fpos = (float)pos;
-    m_oldHorizontalPos = fpos;
+    bool is_waiting = TRUE;
 
-    if (fabs(fpos-m_hAdjust->value) < 0.2) return;
-    m_hAdjust->value = fpos;
-  }
-  else
-  {
-    float fpos = (float)pos;
-    m_oldVerticalPos = fpos;
-    if (fabs(fpos-m_vAdjust->value) < 0.2) return;
-    m_vAdjust->value = fpos;
-  };
-  
-  if (m_wxwindow->window)
-  {  
-    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_connect( GTK_OBJECT(menu->m_menu), "hide",
+      GTK_SIGNAL_FUNC(gtk_pop_hide_callback), (gpointer)&is_waiting );
 
-int wxWindow::GetScrollThumb( int orient ) const
-{
-  if (!m_wxwindow) return 0;
+    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
+                  gs_timeLastClick             // the time of activation
+                );
 
-  if (orient == wxHORIZONTAL)
-    return (int)(m_hAdjust->page_size+0.5);
-  else
-    return (int)(m_vAdjust->page_size+0.5);
-};
+    while (is_waiting)
+    {
+        while (gtk_events_pending())
+            gtk_main_iteration();
+    }
 
-int wxWindow::GetScrollPos( int orient ) const
-{
-  if (!m_wxwindow) return 0;
+    return TRUE;
+}
 
-  if (orient == wxHORIZONTAL)
-    return (int)(m_hAdjust->value+0.5);
-  else
-    return (int)(m_vAdjust->value+0.5);
-};
+#if wxUSE_DRAG_AND_DROP
 
-int wxWindow::GetScrollRange( int orient ) const
+void wxWindow::SetDropTarget( wxDropTarget *dropTarget )
 {
-  if (!m_wxwindow) return 0;
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 
-  if (orient == wxHORIZONTAL)
-    return (int)(m_hAdjust->upper+0.5);
-  else
-    return (int)(m_vAdjust->upper+0.5);
-};
+    GtkWidget *dnd_widget = GetConnectWidget();
 
-void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
-{
-  if (!m_wxwindow) return;
-  
-  m_drawingOffsetX += dx;
-  m_drawingOffsetY += dy;
-  
-//  printf( "X: %d  Y: %d  \n", (int)m_drawingOffsetX, (int)m_drawingOffsetY );
-  
-  gtk_myfixed_set_offset( GTK_MYFIXED(m_wxwindow), m_drawingOffsetX, m_drawingOffsetY );
-  
-/*
-    The code here is very nifty, but it doesn't work with
-    overlapping windows...
+    if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
 
-    int cw = 0;
-    int ch = 0;
-    GetClientSize( &cw, &ch );
-    
-    int w = cw - abs(dx);
-    int h = ch - abs(dy);
-    if ((h < 0) || (w < 0))
-    {
-      Refresh();
-      return;
-    };
-    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( m_wxwindow->window, m_wxwindow->style->fg_gc[0], d_x, d_y,
-      m_wxwindow->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 );
-*/
-};
+    if (m_dropTarget) delete m_dropTarget;
+    m_dropTarget = dropTarget;
 
-void wxWindow::GetDrawingOffset( long *x, long *y )
-{
-  if (x) *x = m_drawingOffsetX;
-  if (y) *y = m_drawingOffsetY;
-};
+    if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
+}
 
-//-------------------------------------------------------------------------------------
-//          Layout
-//-------------------------------------------------------------------------------------
+#endif // wxUSE_DRAG_AND_DROP
 
-wxLayoutConstraints *wxWindow::GetConstraints(void) const
+GtkWidget* wxWindow::GetConnectWidget()
 {
-  return m_constraints;
-};
+    GtkWidget *connect_widget = m_widget;
+    if (m_wxwindow) connect_widget = m_wxwindow;
 
-void wxWindow::SetConstraints( wxLayoutConstraints *constraints )
-{
-  if (m_constraints)
-  {
-    UnsetConstraints(m_constraints);
-    delete m_constraints;
-  }
-  m_constraints = constraints;
-  if (m_constraints)
-  {
-    // Make sure other windows know they're part of a 'meaningful relationship'
-    if (m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this))
-      m_constraints->left.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this))
-      m_constraints->top.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this))
-      m_constraints->right.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this))
-      m_constraints->bottom.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this))
-      m_constraints->width.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this))
-      m_constraints->height.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this))
-      m_constraints->centreX.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-    if (m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this))
-      m_constraints->centreY.GetOtherWindow()->AddConstraintReference((wxWindow *)this);
-  }
-;
+    return connect_widget;
 }
-;
 
-void wxWindow::SetAutoLayout( bool autoLayout )
+bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
 {
-  m_autoLayout = autoLayout;
-};
+    if (m_wxwindow)
+        return (window == GTK_PIZZA(m_wxwindow)->bin_window);
 
-bool wxWindow::GetAutoLayout(void) const
-{
-  return m_autoLayout;
-};
+    return (window == m_widget->window);
+}
 
-wxSizer *wxWindow::GetSizer(void) const
+bool wxWindow::SetFont( const wxFont &font )
 {
-  return m_windowSizer;
-};
+    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
 
-void wxWindow::SetSizerParent( wxWindow *win )
-{
-  m_sizerParent = win;
-};
+    if (!wxWindowBase::SetFont(font))
+    {
+        return FALSE;
+    }
 
-wxWindow *wxWindow::GetSizerParent(void) const
-{
-  return m_sizerParent;
-};
+    wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+    if ( sysbg == m_backgroundColour )
+    {
+        m_backgroundColour = wxNullColour;
+        ApplyWidgetStyle();
+        m_backgroundColour = sysbg;
+    }
+    else
+    {
+        ApplyWidgetStyle();
+    }
 
-// This removes any dangling pointers to this window
-// in other windows' constraintsInvolvedIn lists.
-void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
-{
-  if (c)
-  {
-    if (c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->left.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this))
-      c->top.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this))
-      c->right.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this))
-      c->bottom.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this))
-      c->width.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this))
-      c->height.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this))
-      c->centreX.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-    if (c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this))
-      c->centreY.GetOtherWindow()->RemoveConstraintReference((wxWindow *)this);
-  }
+    return TRUE;
 }
 
-// Back-pointer to other windows we're involved with, so if we delete
-// this window, we must delete any constraints we're involved with.
-void wxWindow::AddConstraintReference(wxWindow *otherWin)
+void wxWindow::CaptureMouse()
 {
-  if (!m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn = new wxList;
-  if (!m_constraintsInvolvedIn->Member(otherWin))
-    m_constraintsInvolvedIn->Append(otherWin);
-}
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindow::RemoveConstraintReference(wxWindow *otherWin)
-{
-  if (m_constraintsInvolvedIn)
-    m_constraintsInvolvedIn->DeleteObject(otherWin);
-}
+    wxCHECK_RET( g_captureWindow == NULL, wxT("CaptureMouse called twice") );
 
-// Reset any constraints that mention this window
-void wxWindow::DeleteRelatedConstraints(void)
-{
-  if (m_constraintsInvolvedIn)
-  {
-    wxNode *node = m_constraintsInvolvedIn->First();
-    while (node)
-    {
-      wxWindow *win = (wxWindow *)node->Data();
-      wxNode *next = node->Next();
-      wxLayoutConstraints *constr = win->GetConstraints();
-
-      // Reset any constraints involving this window
-      if (constr)
-      {
-        constr->left.ResetIfWin((wxWindow *)this);
-        constr->top.ResetIfWin((wxWindow *)this);
-        constr->right.ResetIfWin((wxWindow *)this);
-        constr->bottom.ResetIfWin((wxWindow *)this);
-        constr->width.ResetIfWin((wxWindow *)this);
-        constr->height.ResetIfWin((wxWindow *)this);
-        constr->centreX.ResetIfWin((wxWindow *)this);
-        constr->centreY.ResetIfWin((wxWindow *)this);
-      }
-      delete node;
-      node = next;
-    }
-    delete m_constraintsInvolvedIn;
-    m_constraintsInvolvedIn = NULL;
-  }
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
+
+    if (!window) return;
+
+    gdk_pointer_grab( window, FALSE,
+                      (GdkEventMask)
+                         (GDK_BUTTON_PRESS_MASK |
+                          GDK_BUTTON_RELEASE_MASK |
+                          GDK_POINTER_MOTION_HINT_MASK |
+                          GDK_POINTER_MOTION_MASK),
+                      (GdkWindow *) NULL,
+                      m_cursor.GetCursor(),
+                      (guint32)GDK_CURRENT_TIME );
+    g_captureWindow = this;
 }
 
-void wxWindow::SetSizer(wxSizer *sizer)
+void wxWindow::ReleaseMouse()
 {
-  m_windowSizer = sizer;
-  if (sizer)
-    sizer->SetSizerParent((wxWindow *)this);
-}
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 
-/*
- * New version
- */
+    wxCHECK_RET( g_captureWindow, wxT("ReleaseMouse called twice") );
 
-bool wxWindow::Layout(void)
-{
-  if (GetConstraints())
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    GetConstraints()->width.SetValue(w);
-    GetConstraints()->height.SetValue(h);
-  }
-  
-  // If top level (one sizer), evaluate the sizer's constraints.
-  if (GetSizer())
-  {
-    int noChanges;
-    GetSizer()->ResetConstraints();   // Mark all constraints as unevaluated
-    GetSizer()->LayoutPhase1(&noChanges);
-    GetSizer()->LayoutPhase2(&noChanges);
-    GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
-    return TRUE;
-  }
-  else
-  {
-    // Otherwise, evaluate child constraints
-    ResetConstraints();   // Mark all constraints as unevaluated
-    DoPhase(1);           // Just one phase need if no sizers involved
-    DoPhase(2);
-    SetConstraintSizes(); // Recursively set the real window sizes
-  }
-  return TRUE;
-}
+    GdkWindow *window = (GdkWindow*) NULL;
+    if (m_wxwindow)
+        window = GTK_PIZZA(m_wxwindow)->bin_window;
+    else
+        window = GetConnectWidget()->window;
 
+    if (!window)
+        return;
 
-// Do a phase of evaluating constraints:
-// the default behaviour. wxSizers may do a similar
-// thing, but also impose their own 'constraints'
-// and order the evaluation differently.
-bool wxWindow::LayoutPhase1(int *noChanges)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    return constr->SatisfyConstraints((wxWindow *)this, noChanges);
-  }
-  else
-    return TRUE;
+    gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
+    g_captureWindow = (wxWindow*) NULL;
 }
 
-bool wxWindow::LayoutPhase2(int *noChanges)
+bool wxWindow::IsRetained() const
 {
-  *noChanges = 0;
-  
-  // Layout children
-  DoPhase(1);
-  DoPhase(2);
-  return TRUE;
+    return FALSE;
 }
 
-// Do a phase of evaluating child constraints
-bool wxWindow::DoPhase(int phase)
+void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible,
+      int range, bool refresh )
 {
-  int noIterations = 0;
-  int maxIterations = 500;
-  int noChanges = 1;
-  int noFailures = 0;
-  wxList succeeded;
-  while ((noChanges > 0) && (noIterations < maxIterations))
-  {
-    noChanges = 0;
-    noFailures = 0;
-    wxNode *node = GetChildren()->First();
-    while (node)
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
+
+    m_hasScrolling = TRUE;
+
+    if (orient == wxHORIZONTAL)
     {
-      wxWindow *child = (wxWindow *)node->Data();
-      if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog)))
-      {
-        wxLayoutConstraints *constr = child->GetConstraints();
-        if (constr)
+        float fpos = (float)pos;
+        float frange = (float)range;
+        float fthumb = (float)thumbVisible;
+        if (fpos > frange-fthumb) fpos = frange-fthumb;
+        if (fpos < 0.0) fpos = 0.0;
+
+        if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
+            (fabs(fthumb-m_hAdjust->page_size) < 0.2))
         {
-          if (succeeded.Member(child))
-          {
-          }
-          else
-          {
-            int tempNoChanges = 0;
-            bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ;
-            noChanges += tempNoChanges;
-            if (success)
-            {
-              succeeded.Append(child);
-            }
-          }
+            SetScrollPos( orient, pos, refresh );
+            return;
         }
-      }
-      node = node->Next();
+
+        m_oldHorizontalPos = fpos;
+
+        m_hAdjust->lower = 0.0;
+        m_hAdjust->upper = frange;
+        m_hAdjust->value = fpos;
+        m_hAdjust->step_increment = 1.0;
+        m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
+        m_hAdjust->page_size = fthumb;
     }
-    noIterations ++;
-  }
-  return TRUE;
-}
+    else
+    {
+        float fpos = (float)pos;
+        float frange = (float)range;
+        float fthumb = (float)thumbVisible;
+        if (fpos > frange-fthumb) fpos = frange-fthumb;
+        if (fpos < 0.0) fpos = 0.0;
+
+        if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
+            (fabs(fthumb-m_vAdjust->page_size) < 0.2))
+        {
+            SetScrollPos( orient, pos, refresh );
+            return;
+        }
 
-void wxWindow::ResetConstraints(void)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    constr->left.SetDone(FALSE);
-    constr->top.SetDone(FALSE);
-    constr->right.SetDone(FALSE);
-    constr->bottom.SetDone(FALSE);
-    constr->width.SetDone(FALSE);
-    constr->height.SetDone(FALSE);
-    constr->centreX.SetDone(FALSE);
-    constr->centreY.SetDone(FALSE);
-  }
-  wxNode *node = GetChildren()->First();
-  while (node)
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-      win->ResetConstraints();
-    node = node->Next();
-  }
+        m_oldVerticalPos = fpos;
+
+        m_vAdjust->lower = 0.0;
+        m_vAdjust->upper = frange;
+        m_vAdjust->value = fpos;
+        m_vAdjust->step_increment = 1.0;
+        m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
+        m_vAdjust->page_size = fthumb;
+    }
+
+    if (orient == wxHORIZONTAL)
+        gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+    else
+        gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
 }
 
-// Need to distinguish between setting the 'fake' size for
-// windows and sizers, and setting the real values.
-void wxWindow::SetConstraintSizes(bool recurse)
+void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr && constr->left.GetDone() && constr->right.GetDone() &&
-                constr->width.GetDone() && constr->height.GetDone())
-  {
-    int x = constr->left.GetValue();
-    int y = constr->top.GetValue();
-    int w = constr->width.GetValue();
-    int h = constr->height.GetValue();
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
 
-    // If we don't want to resize this window, just move it...
-    if ((constr->width.GetRelationship() != wxAsIs) ||
-        (constr->height.GetRelationship() != wxAsIs))
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
+
+    if (orient == wxHORIZONTAL)
     {
-      // Calls Layout() recursively. AAAGH. How can we stop that.
-      // Simply take Layout() out of non-top level OnSizes.
-      SizerSetSize(x, y, w, h);
+        float fpos = (float)pos;
+        if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
+        if (fpos < 0.0) fpos = 0.0;
+        m_oldHorizontalPos = fpos;
+
+        if (fabs(fpos-m_hAdjust->value) < 0.2) return;
+        m_hAdjust->value = fpos;
     }
     else
     {
-      SizerMove(x, y);
+        float fpos = (float)pos;
+        if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
+        if (fpos < 0.0) fpos = 0.0;
+        m_oldVerticalPos = fpos;
+
+        if (fabs(fpos-m_vAdjust->value) < 0.2) return;
+        m_vAdjust->value = fpos;
     }
-  }
-  else if (constr)
-  {
-    char *windowClass = this->GetClassInfo()->GetClassName();
-
-    wxString winName;
-       if (GetName() == "")
-               winName = "unnamed";
-       else
-               winName = GetName();
-    wxDebugMsg("Constraint(s) not satisfied for window of type %s, name %s:\n", (const char *)windowClass, (const char *)winName);
-    if (!constr->left.GetDone())
-      wxDebugMsg("  unsatisfied 'left' constraint.\n");
-    if (!constr->right.GetDone())
-      wxDebugMsg("  unsatisfied 'right' constraint.\n");
-    if (!constr->width.GetDone())
-      wxDebugMsg("  unsatisfied 'width' constraint.\n");
-    if (!constr->height.GetDone())
-      wxDebugMsg("  unsatisfied 'height' constraint.\n");
-    wxDebugMsg("Please check constraints: try adding AsIs() constraints.\n");
-  }
 
-  if (recurse)
-  {
-    wxNode *node = GetChildren()->First();
-    while (node)
+/*
+    if (!m_isScrolling)
     {
-      wxWindow *win = (wxWindow *)node->Data();
-      if (!win->IsKindOf(CLASSINFO(wxFrame)) && !win->IsKindOf(CLASSINFO(wxDialog)))
-        win->SetConstraintSizes();
-      node = node->Next();
+*/
+        if (m_wxwindow->window)
+        {
+            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" );
+        }
+/*
     }
-  }
+*/
 }
 
-// This assumes that all sizers are 'on' the same
-// window, i.e. the parent of this window.
-void wxWindow::TransformSizerToActual(int *x, int *y) const
+int wxWindow::GetScrollThumb( int orient ) const
 {
-  if (!m_sizerParent || m_sizerParent->IsKindOf(CLASSINFO(wxDialog)) ||
-                        m_sizerParent->IsKindOf(CLASSINFO(wxFrame)) )
-    return;
-    
-  int xp, yp;
-  m_sizerParent->GetPosition(&xp, &yp);
-  m_sizerParent->TransformSizerToActual(&xp, &yp);
-  *x += xp;
-  *y += yp;
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
+
+    if (orient == wxHORIZONTAL)
+        return (int)(m_hAdjust->page_size+0.5);
+    else
+        return (int)(m_vAdjust->page_size+0.5);
 }
 
-void wxWindow::SizerSetSize(int x, int y, int w, int h)
+int wxWindow::GetScrollPos( int orient ) const
 {
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  SetSize(xx, yy, w, h);
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
+
+    if (orient == wxHORIZONTAL)
+        return (int)(m_hAdjust->value+0.5);
+    else
+        return (int)(m_vAdjust->value+0.5);
 }
 
-void wxWindow::SizerMove(int x, int y)
+int wxWindow::GetScrollRange( int orient ) const
 {
-       int xx = x;
-       int yy = y;
-  TransformSizerToActual(&xx, &yy);
-  Move(xx, yy);
+    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+
+    wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
+
+    if (orient == wxHORIZONTAL)
+        return (int)(m_hAdjust->upper+0.5);
+    else
+        return (int)(m_vAdjust->upper+0.5);
 }
 
-// Only set the size/position of the constraint (if any)
-void wxWindow::SetSizeConstraint(int x, int y, int w, int h)
+void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
-    {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
-    }
-    if (y != -1)
-    {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
-    }
-    if (w != -1)
+    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+
+    wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
+
+/*
+    printf( "ScrollWindow: %d %d\n", dx, dy );
+*/
+
+    gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
+
+/*
+    if (!m_scrollGC)
     {
-      constr->width.SetValue(w);
-      constr->width.SetDone(TRUE);
+        m_scrollGC = gdk_gc_new( m_wxwindow->window );
+        gdk_gc_set_exposures( m_scrollGC, TRUE );
     }
-    if (h != -1)
+
+    wxNode *node = m_children.First();
+    while (node)
     {
-      constr->height.SetValue(h);
-      constr->height.SetDone(TRUE);
+        wxWindow *child = (wxWindow*) node->Data();
+        int sx = 0;
+        int sy = 0;
+        child->GetSize( &sx, &sy );
+        child->SetSize( child->m_x + dx, child->m_y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE );
+        node = node->Next();
     }
-  }
-}
 
-void wxWindow::MoveConstraint(int x, int y)
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    if (x != -1)
+    int cw = 0;
+    int ch = 0;
+    GetClientSize( &cw, &ch );
+    int w = cw - abs(dx);
+    int h = ch - abs(dy);
+
+    if ((h < 0) || (w < 0))
     {
-      constr->left.SetValue(x);
-      constr->left.SetDone(TRUE);
+        Refresh();
     }
-    if (y != -1)
+    else
     {
-      constr->top.SetValue(y);
-      constr->top.SetDone(TRUE);
+        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( m_wxwindow->window, m_scrollGC, d_x, d_y,
+            m_wxwindow->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 );
     }
-  }
-}
-
-void wxWindow::GetSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetSize(w, h);
-}
-
-void wxWindow::GetClientSizeConstraint(int *w, int *h) const
-{
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *w = constr->width.GetValue();
-    *h = constr->height.GetValue();
-  }
-  else
-    GetClientSize(w, h);
+*/
 }
 
-void wxWindow::GetPositionConstraint(int *x, int *y) const
+void wxWindow::SetScrolling(bool scroll)
 {
-  wxLayoutConstraints *constr = GetConstraints();
-  if (constr)
-  {
-    *x = constr->left.GetValue();
-    *y = constr->top.GetValue();
-  }
-  else
-    GetPosition(x, y);
+    m_isScrolling = g_blockEventsOnScroll = scroll;
 }
-