Added the missing check for libw needed for wcslen() (Just defines in headers

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index e7b368139fcd307de298ab4f9cdd67e8ce45d631..38b56e56d9e0283228d9b6d33a875bf0e8c8fbdd 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -31,6 +31,7 @@
 
 const int wxMENU_HEIGHT    = 27;
 const int wxSTATUS_HEIGHT  = 25;
 
 const int wxMENU_HEIGHT    = 27;
 const int wxSTATUS_HEIGHT  = 25;

+const int wxPLACE_HOLDER   = 0;

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -79,6 +80,54 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
     return TRUE;
 }
 
     return TRUE;
 }
 

+//-----------------------------------------------------------------------------
+// "child_attached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->HasVMT()) return;
+    
+    win->m_menuBarDetached = FALSE;
+    win->m_sizeSet = FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of menu bar
+//-----------------------------------------------------------------------------
+
+static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->HasVMT()) return;
+    
+    win->m_menuBarDetached = TRUE;
+    win->m_sizeSet = FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "child_attached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->HasVMT()) return;
+    
+    win->m_toolBarDetached = FALSE;
+    win->m_sizeSet = FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "child_detached" of tool bar
+//-----------------------------------------------------------------------------
+
+static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
+{
+    if (!win->HasVMT()) return;
+    
+    win->m_toolBarDetached = TRUE;
+    win->m_sizeSet = FALSE;
+}
+

 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "configure_event"
 //-----------------------------------------------------------------------------


@@ -97,6 +146,56 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
     return FALSE;
 }
 
     return FALSE;
 }
 

+//-----------------------------------------------------------------------------
+// "realize" from m_widget
+//-----------------------------------------------------------------------------
+
+/* we cannot MWM hints and icons before the widget has been realized, 
+   so we do this directly after realization */
+
+static gint 
+gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
+{
+    /* 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_ALL;
+    long func = (long) GDK_FUNC_ALL;
+    
+    if ((win->m_windowStyle & wxCAPTION) == 0)
+       decor |= GDK_DECOR_TITLE;
+/*  if ((win->m_windowStyle & wxMINIMIZE) == 0)
+       func |= GDK_FUNC_MINIMIZE;
+    if ((win->m_windowStyle & wxMAXIMIZE) == 0)
+       func |= GDK_FUNC_MAXIMIZE;            */
+    if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
+       decor |= GDK_DECOR_MENU;
+    if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
+       decor |= GDK_DECOR_MINIMIZE;
+    if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
+       decor |= GDK_DECOR_MAXIMIZE;
+    if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
+       func |= GDK_FUNC_RESIZE;
+       
+    gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
+    gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
+      
+    /* GTK's shrinking/growing policy */
+    if ((win->m_windowStyle & 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);
+    
+    /* reset the icon */
+    if (win->m_icon != wxNullIcon)
+    {
+        wxIcon icon( win->m_icon );
+        win->m_icon = wxNullIcon;
+       win->SetIcon( icon );
+    }
+    
+    return FALSE;
+}
+    

 //-----------------------------------------------------------------------------
 // InsertChild for wxFrame
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // InsertChild for wxFrame
 //-----------------------------------------------------------------------------


@@ -110,12 +209,30 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
 {
     if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
     {
 {
     if (wxIS_KIND_OF(child,wxToolBar) || wxIS_KIND_OF(child,wxMenuBar))
     {

+        /* actually, menubars are never inserted here, but this
+          may change one day */
+    

         /* these are outside the client area */
        wxFrame* frame = (wxFrame*) parent;
         gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y );
         /* these are outside the client area */
        wxFrame* frame = (wxFrame*) parent;
         gtk_myfixed_put( GTK_MYFIXED(frame->m_mainWidget),
                          GTK_WIDGET(child->m_widget),
                          child->m_x,
                          child->m_y );

+                        
+       /* 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)
+           {
+                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 );
+           }
+       }

     }
     else
     {
     }
     else
     {


@@ -132,13 +249,6 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
 
     /* resize on OnInternalIdle */
     parent->m_sizeSet = FALSE;
 
     /* resize on OnInternalIdle */
     parent->m_sizeSet = FALSE;

-
-    if (parent->m_windowStyle & wxTAB_TRAVERSAL)
-    {
-        /* we now allow a window to get the focus as long as it
-           doesn't have any children. */
-        GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
-    }

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


@@ -156,13 +266,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 wxFrame::wxFrame()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
 wxFrame::wxFrame()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;

-    m_mdiMenuBar = (wxMenuBar *) NULL;

     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
     m_mainWidget = (GtkWidget*) NULL;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
     m_mainWidget = (GtkWidget*) NULL;

+    m_menuBarDetached = FALSE;
+    m_toolBarDetached = FALSE;
+    m_insertCallback = wxInsertChildInFrame;

 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,


@@ -170,13 +282,15 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       long style, const wxString &name )
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
       long style, const wxString &name )
 {
     m_frameMenuBar = (wxMenuBar *) NULL;

-    m_mdiMenuBar = (wxMenuBar *) NULL;

     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
     m_mainWidget = (GtkWidget*) NULL;
     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
     m_mainWidget = (GtkWidget*) NULL;

+    m_menuBarDetached = FALSE;
+    m_toolBarDetached = FALSE;
+    m_insertCallback = wxInsertChildInFrame;

     Create( parent, id, title, pos, size, style, name );
 }
 
     Create( parent, id, title, pos, size, style, name );
 }
 


@@ -199,12 +313,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
 
     m_widget = gtk_window_new( win_type );
 

-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );

     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 

-    /* needed ? */
-    gtk_window_set_policy( GTK_WINDOW(m_widget), 1, 1, 0 );
-

     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
 


@@ -213,41 +324,28 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
     gtk_widget_show( m_mainWidget );
     GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );

-    gtk_widget_realize( m_mainWidget );

     
     /* m_wxwindow only represents the client area without toolbar and menubar */
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     
     /* m_wxwindow only represents the client area without toolbar and menubar */
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );

-    GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );

     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );

+    
+    /* we allow the frame to get the focus as otherwise no
+       key events will get sent to it. the point with this is
+       that the menu's key accelerators work by interceting
+       key events here */
+    GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+    gtk_widget_grab_focus( m_wxwindow );

 
     if (m_parent) m_parent->AddChild( this );
 
     PostCreation();
 
 
     if (m_parent) m_parent->AddChild( this );
 
     PostCreation();
 

-    gtk_widget_realize( m_widget );
+    /*  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 );

     
     

-    /* 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_ALL;
-    long func = (long) GDK_FUNC_ALL;
-    if ((m_windowStyle & wxCAPTION) == 0)
-       decor |= GDK_DECOR_TITLE;
-    if ((m_windowStyle & wxMINIMIZE) == 0)
-       func |= GDK_FUNC_MINIMIZE;
-    if ((m_windowStyle & wxMAXIMIZE) == 0)
-       func |= GDK_FUNC_MAXIMIZE;
-    if ((m_windowStyle & wxSYSTEM_MENU) == 0)
-       decor |= GDK_DECOR_MENU;
-    if ((m_windowStyle & wxMINIMIZE_BOX) == 0)
-       decor |= GDK_DECOR_MINIMIZE;
-    if ((m_windowStyle & wxMAXIMIZE_BOX) == 0)
-       decor |= GDK_DECOR_MAXIMIZE;
-    if ((m_windowStyle & wxRESIZE_BORDER) == 0)
-       func |= GDK_FUNC_RESIZE;
-    gdk_window_set_decorations(m_widget->window, (GdkWMDecoration)decor);
-    gdk_window_set_functions(m_widget->window, (GdkWMFunction)func);
-      

     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
     /* the user resized the frame by dragging etc. */
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );


@@ -273,19 +371,15 @@ wxFrame::~wxFrame()
     wxTopLevelWindows.DeleteObject( this );
 
     if (wxTheApp->GetTopWindow() == this)
     wxTopLevelWindows.DeleteObject( this );
 
     if (wxTheApp->GetTopWindow() == this)

-    {

         wxTheApp->SetTopWindow( (wxWindow*) NULL );
         wxTheApp->SetTopWindow( (wxWindow*) NULL );

-    }

 
     if (wxTopLevelWindows.Number() == 0)
 
     if (wxTopLevelWindows.Number() == 0)

-    {

         wxTheApp->ExitMainLoop();
         wxTheApp->ExitMainLoop();

-    }

 }
 
 bool wxFrame::Show( bool show )
 {
 }
 
 bool wxFrame::Show( bool show )
 {

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

 
     if (show && !m_sizeSet)
     {
 
     if (show && !m_sizeSet)
     {


@@ -302,7 +396,7 @@ bool wxFrame::Show( bool show )
 
 bool wxFrame::Destroy()
 {
 
 bool wxFrame::Destroy()
 {

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

 
     if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
 
 
     if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
 


@@ -311,10 +405,10 @@ bool wxFrame::Destroy()
 
 void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

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

 
     /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
 
     /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */

-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );

     
     /* avoid recursions */
     if (m_resizing) return; 
     
     /* avoid recursions */
     if (m_resizing) return; 


@@ -359,8 +453,8 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     {
         if ((m_x != old_x) || (m_y != old_y))
         {
     {
         if ((m_x != old_x) || (m_y != old_y))
         {

-            /* m_sizeSet = FALSE; */
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+            /* we set the size here and in gtk_frame_map_callback */
+           gtk_widget_set_uposition( m_widget, m_x, m_y );

         }
     }
 
         }
     }
 


@@ -377,7 +471,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
 void wxFrame::Centre( int direction )
 {
 
 void wxFrame::Centre( int direction )
 {

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

 
     int x = 0;
     int y = 0;
 
     int x = 0;
     int y = 0;


@@ -390,19 +484,37 @@ void wxFrame::Centre( int direction )
 
 void wxFrame::GetClientSize( int *width, int *height ) const
 {
 
 void wxFrame::GetClientSize( int *width, int *height ) const
 {

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

 
     wxWindow::GetClientSize( width, height );
     if (height)
     {
 
     wxWindow::GetClientSize( width, height );
     if (height)
     {

-        if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
+        /* menu bar */
+        if (m_frameMenuBar)
+       {
+           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 */

         if (m_frameToolBar)
         {
         if (m_frameToolBar)
         {

-            int y = 0;
-            m_frameToolBar->GetSize( (int *) NULL, &y );
-            (*height) -= y;
+           if (!m_toolBarDetached)
+           {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                (*height) -= y;
+           }
+           else
+                (*height) -= wxPLACE_HOLDER;

         }
         }

+       
+       /* mini edge */

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


@@ -413,18 +525,34 @@ void wxFrame::GetClientSize( int *width, int *height ) const
 
 void wxFrame::DoSetClientSize( int width, int height )
 {
 
 void wxFrame::DoSetClientSize( int width, int height )
 {

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

 
 

-    int h = height;
-    if (m_frameMenuBar) h += wxMENU_HEIGHT;
-    if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
-    if (m_frameToolBar)
-    {
-        int y = 0;
-        m_frameToolBar->GetSize( (int *) NULL, &y );
-        h += y;
-    }
-    wxWindow::DoSetClientSize( width + m_miniEdge*2, h  + m_miniEdge*2 + m_miniTitle );
+        /* menu bar */
+        if (m_frameMenuBar)
+       {
+           if (!m_menuBarDetached) 
+               height += wxMENU_HEIGHT;
+           else
+               height += wxPLACE_HOLDER;
+       }
+       
+       /* status bar */
+        if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
+       
+       /* tool bar */
+        if (m_frameToolBar)
+        {
+           if (!m_toolBarDetached)
+           {
+                int y = 0;
+                m_frameToolBar->GetSize( (int *) NULL, &y );
+                height += y;
+           }
+           else
+                height += wxPLACE_HOLDER;
+        }
+       
+    wxWindow::DoSetClientSize( width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle );

 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 }
 
 void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )


@@ -438,7 +566,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     m_resizing = TRUE;
 
     /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */
     m_resizing = TRUE;
 
     /* this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow */

-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );

     
     m_width = width;
     m_height = height;
     
     m_width = width;
     m_height = height;


@@ -473,6 +601,7 @@ 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;

             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_x = xx;
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;


@@ -488,13 +617,19 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;

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

             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;

-
+           if (m_toolBarDetached) hh = wxPLACE_HOLDER; 

             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;

-            m_frameToolBar->m_height = hh;
+            /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */

             m_frameToolBar->m_width = ww;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy );
             m_frameToolBar->m_width = ww;
 
             gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_frameToolBar->m_widget, xx, yy );


@@ -503,11 +638,20 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
            client_area_y_offset += hh;
         }
     
            client_area_y_offset += hh;
         }
     

-        gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, 0, client_area_y_offset );
+        int client_x = m_miniEdge;
+       int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
+        gtk_myfixed_move( GTK_MYFIXED(m_mainWidget), m_wxwindow, client_x, client_y );
+
+        int client_w = m_width - 2*m_miniEdge;
+       int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
+        gtk_widget_set_usize( m_wxwindow, client_w, client_h );
+    }
+    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. */

     }
     
     }
     

-    gtk_widget_set_usize( m_wxwindow, m_width, m_height-client_area_y_offset );
-

     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;


@@ -547,7 +691,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
 void wxFrame::OnInternalIdle()
 {
 
 void wxFrame::OnInternalIdle()
 {

-    if (!m_sizeSet)
+    if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))

         GtkOnSize( m_x, m_y, m_width, m_height );
 
     DoMenuUpdates();
         GtkOnSize( m_x, m_y, m_width, m_height );
 
     DoMenuUpdates();


@@ -560,7 +704,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent& event )
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

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

 
     if (GetAutoLayout())
     {
 
     if (GetAutoLayout())
     {


@@ -611,13 +755,18 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
 
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {

-    wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-    wxASSERT_MSG( (m_wxwindow != NULL), "invalid frame" );
+    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );

 
     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {
 
     m_frameMenuBar = menuBar;
 
     if (m_frameMenuBar)
     {

+        /* support for native key accelerators indicated by underscroes */
+#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
+         gtk_accel_group_attach( m_frameMenuBar->m_accel, GTK_OBJECT(m_widget));
+#endif
+

         wxNode *node = m_frameMenuBar->GetMenus().First();
         while (node)
         {
         wxNode *node = m_frameMenuBar->GetMenus().First();
         while (node)
         {


@@ -631,13 +780,19 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
             m_frameMenuBar->m_parent = this;
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
             m_frameMenuBar->m_parent = this;
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
                 m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );

-
-            /* an mdi child menu bar might be underneath */
-            if (m_mdiMenuBar)
-                m_frameMenuBar->Show( FALSE );
+       
+           if (menuBar->m_windowStyle & 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_detached",
+                    GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
+           }

         }
     }
 
         }
     }
 

+    /* resize window in OnInternalIdle */

     m_sizeSet = FALSE;
 }
 
     m_sizeSet = FALSE;
 }
 


@@ -669,9 +824,9 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {

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

 
 

-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, "recreating toolbar in wxFrame" );
+    wxCHECK_MSG( m_frameToolBar == NULL, FALSE, _T("recreating toolbar in wxFrame") );

 
     m_frameToolBar = OnCreateToolBar( style, id, name );
 
 
     m_frameToolBar = OnCreateToolBar( style, id, name );
 


@@ -694,9 +849,9 @@ wxToolBar *wxFrame::GetToolBar() const
 
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {
 
 wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )
 {

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

 
 

-    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, "recreating status bar in wxFrame" );
+    wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, _T("recreating status bar in wxFrame") );

 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
 
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
 


@@ -748,18 +903,18 @@ void wxFrame::Command( int id )
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

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

 
 

-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );

 
     m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {
 
     m_frameStatusBar->SetStatusText(text, number);
 }
 
 void wxFrame::SetStatusWidths(int n, const int widths_field[] )
 {

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

 
 

-    wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set widths for") );

 
     m_frameStatusBar->SetStatusWidths(n, widths_field);
 }
 
     m_frameStatusBar->SetStatusWidths(n, widths_field);
 }


@@ -771,20 +926,22 @@ wxStatusBar *wxFrame::GetStatusBar() const
 
 void wxFrame::SetTitle( const wxString &title )
 {
 
 void wxFrame::SetTitle( const wxString &title )
 {

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

 
     m_title = title;
 
     m_title = title;

-    if (m_title.IsNull()) m_title = "";
-    gtk_window_set_title( GTK_WINDOW(m_widget), title );
+    if (m_title.IsNull()) m_title = _T("");
+    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );

 }
 
 void wxFrame::SetIcon( const wxIcon &icon )
 {
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )
 {

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

 
     m_icon = icon;
     if (!icon.Ok()) return;
 
 
     m_icon = icon;
     if (!icon.Ok()) return;
 

+    if (!m_widget->window) return;
+

     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();