Played a little with sockets.

[wxWidgets.git] / src / gtk / frame.cpp

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index c65d52a01c5683efdde1fde7624298b4876ae166..e2b33215317cc922bd36db9f8e04456e25a75fc7 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -24,6 +24,7 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"

+#include "gdk/gdkkeysyms.h"

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -62,23 +63,17 @@ extern void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar
 
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
 
 static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return;
-
-/*
-    printf( "OnFrameResize from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
-
-   if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
-   {
-       win->m_sizeSet = FALSE;
-       win->m_width = alloc->width;
-       win->m_height = alloc->height;
-   }
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+
+    if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+    {
+        win->m_width = alloc->width;
+        win->m_height = alloc->height;
+        win->UpdateSize();
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -87,14 +82,8 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
 static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {
 
 static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-/*
-    printf( "OnDelete from " );
-    if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-        printf( win->GetClassInfo()->GetClassName() );
-    printf( ".\n" );
-*/
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
     win->Close();
 
 
     win->Close();
 


@@ -107,12 +96,10 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     
     win->m_menuBarDetached = FALSE;
     
     win->m_menuBarDetached = FALSE;

-    win->m_sizeSet = FALSE;
+    win->UpdateSize();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -121,12 +108,10 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     
     win->m_menuBarDetached = TRUE;
     
     win->m_menuBarDetached = TRUE;

-    win->m_sizeSet = FALSE;
+    win->UpdateSize();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -135,12 +120,11 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     
     win->m_toolBarDetached = FALSE;
     
     win->m_toolBarDetached = FALSE;

-    win->m_sizeSet = FALSE;
+    
+    win->UpdateSize();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -149,12 +133,13 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 
 static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
 {
 
 static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     
     win->m_toolBarDetached = TRUE;
     
     win->m_toolBarDetached = TRUE;

-    win->m_sizeSet = FALSE;
+    win->UpdateSize();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -163,9 +148,10 @@ static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSE
 
 static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 {
 
 static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
 

-    if (!win->HasVMT()) return FALSE;
+    if (!win->m_hasVMT) return FALSE;

 
     win->m_x = event->x;
     win->m_y = event->y;
 
     win->m_x = event->x;
     win->m_y = event->y;


@@ -187,31 +173,32 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 static gint 
 gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 {
 static gint 
 gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
     long func = (long) GDK_FUNC_MOVE;
     
 
     /* all this is for Motif Window Manager "hints" and is supposed to be
        recognized by other WM as well. not tested. */
     long decor = (long) GDK_DECOR_BORDER;
     long func = (long) GDK_FUNC_MOVE;
     

-    if ((win->m_windowStyle & wxCAPTION) != 0)
-       decor |= GDK_DECOR_TITLE;
-    if ((win->m_windowStyle & wxSYSTEM_MENU) != 0)
+    if ((win->GetWindowStyle() & wxCAPTION) != 0)
+        decor |= GDK_DECOR_TITLE;
+    if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)

     {
        decor |= GDK_DECOR_MENU;
        func |= GDK_FUNC_CLOSE;
     }
     {
        decor |= GDK_DECOR_MENU;
        func |= GDK_FUNC_CLOSE;
     }

-    if ((win->m_windowStyle & wxMINIMIZE_BOX) != 0)
+    if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)

     {
     {

-       func |= GDK_FUNC_MINIMIZE;
-       decor |= GDK_DECOR_MINIMIZE;
+        func |= GDK_FUNC_MINIMIZE;
+        decor |= GDK_DECOR_MINIMIZE;

     }
     }

-    if ((win->m_windowStyle & wxMAXIMIZE_BOX) != 0)
+    if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)

     {
     {

-       func |= GDK_FUNC_MAXIMIZE;
-       decor |= GDK_DECOR_MAXIMIZE;
+        func |= GDK_FUNC_MAXIMIZE;
+        decor |= GDK_DECOR_MAXIMIZE;

     }
     }

-    if ((win->m_windowStyle & wxRESIZE_BORDER) != 0)
+    if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)

     {
        func |= GDK_FUNC_RESIZE;
        decor |= GDK_DECOR_RESIZEH;
     {
        func |= GDK_FUNC_RESIZE;
        decor |= GDK_DECOR_RESIZEH;


@@ -222,7 +209,7 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
       
     /* GTK's shrinking/growing policy */
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
       
     /* GTK's shrinking/growing policy */

-    if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
+    if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)

         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);


@@ -232,22 +219,22 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
     {
         wxIcon icon( win->m_icon );
         win->m_icon = wxNullIcon;
     {
         wxIcon icon( win->m_icon );
         win->m_icon = wxNullIcon;

-       win->SetIcon( icon );
+        win->SetIcon( icon );

     }
     
     /* we set the focus to the child that accepts the focus. this
        doesn't really have to be done in "realize" but why not? */
     }
     
     /* we set the focus to the child that accepts the focus. this
        doesn't really have to be done in "realize" but why not? */

-    wxNode *node = win->m_children.First();
+    wxWindowList::Node *node = win->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow *child = (wxWindow*) node->Data();
-       if (child->AcceptsFocus())
-       {
-           child->SetFocus();
-           break;
-       }
-       
-        node = node->Next();
+        wxWindow *child = node->GetData();
+        if (child->AcceptsFocus())
+        {
+            child->SetFocus();
+            break;
+        }
+        
+        node = node->GetNext();

     }
     
     return FALSE;
     }
     
     return FALSE;


@@ -267,31 +254,31 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
     if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
     {
         /* actually, menubars are never inserted here, but this
     if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
     {
         /* actually, menubars are never inserted here, but this

-          may change one day */
+           may change one day */

     
         /* these are outside the client area */
     
         /* these are outside the client area */

-       wxFrame* frame = (wxFrame*) parent;
+        wxFrame* frame = (wxFrame*) parent;

         gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,
         gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,

-                        child->m_width,
-                        child->m_height );
-                        
-       /* we connect to these events for recalculating the client area
-          space when the toolbar is floating */
-       if (wxIS_KIND_OF(child,wxToolBar))
-       {
-           wxToolBar *toolBar = (wxToolBar*) child;
-           if (toolBar->m_windowStyle & wxTB_DOCKABLE)
-           {
+                         child->m_width,
+                         child->m_height );
+                         
+        /* we connect to these events for recalculating the client area
+           space when the toolbar is floating */
+        if (wxIS_KIND_OF(child,wxToolBar))
+        {
+            wxToolBar *toolBar = (wxToolBar*) child;
+            if (toolBar->GetWindowStyle() & wxTB_DOCKABLE)
+            {

                 gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached",
                     GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent );
                 gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_attached",
                     GTK_SIGNAL_FUNC(gtk_toolbar_attached_callback), (gpointer)parent );

-                   
+                    

                 gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent );
                 gtk_signal_connect( GTK_OBJECT(toolBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_toolbar_detached_callback), (gpointer)parent );

-           }
-       }
+            }
+        }

     }
     else
     {
     }
     else
     {


@@ -300,12 +287,12 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y,

-                        child->m_width,
-                        child->m_height );
+                         child->m_width,
+                         child->m_height );

     }
 
     /* resize on OnInternalIdle */
     }
 
     /* resize on OnInternalIdle */

-    parent->m_sizeSet = FALSE;
+    parent->UpdateSize();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -413,7 +400,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     /*  we cannot set MWM hints and icons before the widget has
         been realized, so we do this directly after realization */
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
     /*  we cannot set MWM hints and icons before the widget has
         been realized, so we do this directly after realization */
     gtk_signal_connect( GTK_OBJECT(m_widget), "realize",

-                       GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this );
+                        GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this );

     
     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
     
     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",


@@ -428,6 +415,8 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {

+    m_isBeingDeleted = TRUE;
+    

     if (m_frameMenuBar) delete m_frameMenuBar;
     m_frameMenuBar = (wxMenuBar *) NULL;
     
     if (m_frameMenuBar) delete m_frameMenuBar;
     m_frameMenuBar = (wxMenuBar *) NULL;
     


@@ -523,15 +512,15 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         if ((m_x != old_x) || (m_y != old_y))
         {
             /* we set the size here and in gtk_frame_map_callback */
         if ((m_x != old_x) || (m_y != old_y))
         {
             /* we set the size here and in gtk_frame_map_callback */

-           gtk_widget_set_uposition( m_widget, m_x, m_y );
+            gtk_widget_set_uposition( m_widget, m_x, m_y );

         }
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
         /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
         }
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
         /* we set the size in GtkOnSize, i.e. mostly the actual resizing is

-          done either directly before the frame is shown or in idle time
-          so that different calls to SetSize() don't lead to flicker. */
+           done either directly before the frame is shown or in idle time
+           so that different calls to SetSize() don't lead to flicker. */

         m_sizeSet = FALSE;
     }
 
         m_sizeSet = FALSE;
     }
 


@@ -551,39 +540,39 @@ void wxFrame::Centre( int direction )
     Move( x, y );
 }
 
     Move( x, y );
 }
 

-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const

 {
     wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
 {
     wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 

-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );

     if (height)
     {
         /* menu bar */
         if (m_frameMenuBar)
     if (height)
     {
         /* menu bar */
         if (m_frameMenuBar)

-       {
-           if (!m_menuBarDetached) 
-               (*height) -= wxMENU_HEIGHT;
-           else
-               (*height) -= wxPLACE_HOLDER;
-       }
-       
-       /* status bar */
+        {
+            if (!m_menuBarDetached) 
+                (*height) -= wxMENU_HEIGHT;
+            else
+                (*height) -= wxPLACE_HOLDER;
+        }
+        
+        /* status bar */

         if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
         if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;

-       
-       /* tool bar */
+        
+        /* tool bar */

         if (m_frameToolBar)
         {
         if (m_frameToolBar)
         {

-           if (!m_toolBarDetached)
-           {
+            if (!m_toolBarDetached)
+            {

                 int y = 0;
                 m_frameToolBar->GetSize( (int *) NULL, &y );
                 (*height) -= y;
                 int y = 0;
                 m_frameToolBar->GetSize( (int *) NULL, &y );
                 (*height) -= y;

-           }
-           else
+            }
+            else

                 (*height) -= wxPLACE_HOLDER;
         }
                 (*height) -= wxPLACE_HOLDER;
         }

-       
-       /* mini edge */
+        
+        /* mini edge */

         (*height) -= m_miniEdge*2 + m_miniTitle;
     }
     if (width)
         (*height) -= m_miniEdge*2 + m_miniTitle;
     }
     if (width)


@@ -598,29 +587,29 @@ void wxFrame::DoSetClientSize( int width, int height )
 
         /* menu bar */
         if (m_frameMenuBar)
 
         /* menu bar */
         if (m_frameMenuBar)

-       {
-           if (!m_menuBarDetached) 
-               height += wxMENU_HEIGHT;
-           else
-               height += wxPLACE_HOLDER;
-       }
-       
-       /* status bar */
+        {
+            if (!m_menuBarDetached) 
+                height += wxMENU_HEIGHT;
+            else
+                height += wxPLACE_HOLDER;
+        }
+        
+        /* status bar */

         if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
         if (m_frameStatusBar) height += wxSTATUS_HEIGHT;

-       
-       /* tool bar */
+        
+        /* tool bar */

         if (m_frameToolBar)
         {
         if (m_frameToolBar)
         {

-           if (!m_toolBarDetached)
-           {
+            if (!m_toolBarDetached)
+            {

                 int y = 0;
                 m_frameToolBar->GetSize( (int *) NULL, &y );
                 height += y;
                 int y = 0;
                 m_frameToolBar->GetSize( (int *) NULL, &y );
                 height += y;

-           }
-           else
+            }
+            else

                 height += wxPLACE_HOLDER;
         }
                 height += wxPLACE_HOLDER;
         }

-       
+        

     wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );
 }
 
     wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );
 }
 


@@ -670,15 +659,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
             int hh = wxMENU_HEIGHT;
             int yy = m_miniEdge + m_miniTitle;
             int ww = m_width  - 2*m_miniEdge;
             int hh = wxMENU_HEIGHT;

-           if (m_menuBarDetached) hh = wxPLACE_HOLDER;
+            if (m_menuBarDetached) hh = wxPLACE_HOLDER;

             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 

-                                 m_frameMenuBar->m_widget, 
-                                 xx, yy, ww, hh );
-           client_area_y_offset += hh;
+                                  m_frameMenuBar->m_widget, 
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;

         }
     
         if (m_frameToolBar)
         }
     
         if (m_frameToolBar)


@@ -686,12 +675,12 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             if (m_frameMenuBar)
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             if (m_frameMenuBar)

-           {
-               if (!m_menuBarDetached) 
-                   yy += wxMENU_HEIGHT; 
-               else 
-                   yy += wxPLACE_HOLDER;
-           }
+            {
+                if (!m_menuBarDetached) 
+                    yy += wxMENU_HEIGHT; 
+                else 
+                    yy += wxPLACE_HOLDER;
+            }

             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
            if (m_toolBarDetached) hh = wxPLACE_HOLDER; 
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
            if (m_toolBarDetached) hh = wxPLACE_HOLDER; 


@@ -700,23 +689,23 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
             m_frameToolBar->m_width = ww;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
             /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
             m_frameToolBar->m_width = ww;
             gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 

-                                 m_frameToolBar->m_widget, 
-                                 xx, yy, ww, hh );
-           client_area_y_offset += hh;
+                                  m_frameToolBar->m_widget, 
+                                  xx, yy, ww, hh );
+            client_area_y_offset += hh;

         }
     
         int client_x = m_miniEdge;
         }
     
         int client_x = m_miniEdge;

-       int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
+        int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;

         int client_w = m_width - 2*m_miniEdge;
         int client_w = m_width - 2*m_miniEdge;

-       int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;

         gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
         gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 

-                             m_wxwindow, 
-                             client_x, client_y, client_w, client_h );
+                              m_wxwindow, 
+                              client_x, client_y, client_w, client_h );

     }
     else
     {
         /* if there is no m_mainWidget between m_widget and m_wxwindow there
     }
     else
     {
         /* if there is no m_mainWidget between m_widget and m_wxwindow there

-          is no need to set the size or position of m_wxwindow. */
+           is no need to set the size or position of m_wxwindow. */

     }
     
     if (m_frameStatusBar)
     }
     
     if (m_frameStatusBar)


@@ -730,8 +719,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
         gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
         gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 

-                             m_frameStatusBar->m_widget, 
-                             xx, yy, ww, hh );
+                              m_frameStatusBar->m_widget, 
+                              xx, yy, ww, hh );

     }
 
     /* we actually set the size of a frame here and no-where else */
     }
 
     /* we actually set the size of a frame here and no-where else */


@@ -800,7 +789,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
         {
             /* yes: set it's size to fill all the frame */
             int client_x, client_y;
         {
             /* yes: set it's size to fill all the frame */
             int client_x, client_y;

-            GetClientSize( &client_x, &client_y );
+            DoGetClientSize( &client_x, &client_y );

             child->SetSize( 1, 1, client_x-2, client_y-2 );
         }
     }
             child->SetSize( 1, 1, client_x-2, client_y-2 );
         }
     }


@@ -847,24 +836,24 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
             node = node->Next();
         }
 
             node = node->Next();
         }
 

-        if (m_frameMenuBar->m_parent != this)
+        if (m_frameMenuBar->GetParent() != this)

         {
         {

-            m_frameMenuBar->m_parent = this;
+            m_frameMenuBar->SetParent(this);

             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
                 m_frameMenuBar->m_widget, 
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
                 m_frameMenuBar->m_widget, 

-               m_frameMenuBar->m_x, 
-               m_frameMenuBar->m_y,
-               m_frameMenuBar->m_width,
-               m_frameMenuBar->m_height );
-       
-           if (menuBar->m_windowStyle & wxMB_DOCKABLE)
-           {
+                m_frameMenuBar->m_x, 
+                m_frameMenuBar->m_y,
+                m_frameMenuBar->m_width,
+                m_frameMenuBar->m_height );
+        
+            if (menuBar->GetWindowStyle() & wxMB_DOCKABLE)
+            {

                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
                     GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );
                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_attached",
                     GTK_SIGNAL_FUNC(gtk_menu_attached_callback), (gpointer)this );

-                   
+                    

                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
                 gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
                     GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );

-           }
+            }

         }
     }
 
         }
     }