gcc warning about printf() format mismatch corrected

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 258bf925140c4b6301c10b5075478f44677c9c3b..539fb6c9b7e03984ad78264d45c438dc855315c5 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -16,8 +16,12 @@
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/menu.h"

+#if wxUSE_TOOLBAR

 #include "wx/toolbar.h"
 #include "wx/toolbar.h"

+#endif
+#if wxUSE_STATUSBAR

 #include "wx/statusbr.h"
 #include "wx/statusbr.h"

+#endif

 #include "wx/dcclient.h"
 
 #include "glib.h"
 #include "wx/dcclient.h"
 
 #include "glib.h"


@@ -25,6 +29,7 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"

+#include "gdk/gdkx.h"

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


@@ -63,13 +68,23 @@ 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) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
         wxapp_install_idle_handler();
 

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

 
     if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
     {
 
     if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
     {

+/*
+        wxPrintf( "OnSize from " );
+        if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
+           wxPrintf( win->GetClassInfo()->GetClassName() );
+        wxPrintf( " %d %d %d %d\n", (int)alloc->x,
+                                (int)alloc->y,
+                                (int)alloc->width,
+                                (int)alloc->height );
+*/

         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();
         win->m_width = alloc->width;
         win->m_height = alloc->height;
         win->UpdateSize();


@@ -82,7 +97,7 @@ 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) 
+    if (g_isIdle)

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


@@ -97,7 +112,7 @@ 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 )
 {
     if (!win->m_hasVMT) return;
 static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;

-    
+

     win->m_menuBarDetached = FALSE;
     win->UpdateSize();
 }
     win->m_menuBarDetached = FALSE;
     win->UpdateSize();
 }


@@ -109,11 +124,12 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;

-    
+

     win->m_menuBarDetached = TRUE;
     win->UpdateSize();
 }
 
     win->m_menuBarDetached = TRUE;
     win->UpdateSize();
 }
 

+#if wxUSE_TOOLBAR

 //-----------------------------------------------------------------------------
 // "child_attached" of tool bar
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "child_attached" of tool bar
 //-----------------------------------------------------------------------------


@@ -121,9 +137,9 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;
 static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )
 {
     if (!win->m_hasVMT) return;

-    
+

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

-    
+

     win->UpdateSize();
 }
 
     win->UpdateSize();
 }
 


@@ -131,34 +147,44 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 
 // "child_detached" of tool bar
 //-----------------------------------------------------------------------------
 

-static void gtk_toolbar_detached_callback( GtkWidget *widget, GtkWidget *WXUNUSED(child), wxFrame *win )
+static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *WXUNUSED(child), wxFrame *win )

 {
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;

-    
+

     win->m_toolBarDetached = TRUE;
     win->UpdateSize();
 }
     win->m_toolBarDetached = TRUE;
     win->UpdateSize();
 }

+#endif // wxUSE_TOOLBAR

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

-static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
+static gint 
+#if (GTK_MINOR_VERSON > 0)
+gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxFrame *win )
+#else
+gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+#endif

 {
     if (g_isIdle) 
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;
 {
     if (g_isIdle) 
         wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return FALSE;

-    
+
+#if (GTK_MINOR_VERSON > 0)

     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );
     int x = 0;
     int y = 0;
     gdk_window_get_root_origin( win->m_widget->window, &x, &y );

-    

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

+#else
+    win->m_x = event->x;
+    win->m_y = event->y;
+#endif

 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );
 
     wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
     mevent.SetEventObject( win );


@@ -171,20 +197,20 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 
 // "realize" from m_widget
 //-----------------------------------------------------------------------------
 

-/* we cannot MWM hints and icons before the widget has been realized, 
+/* we cannot MWM hints and icons before the widget has been realized,

    so we do this directly after realization */
 
    so we do this directly after realization */
 

-static gint 
-gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
+static gint
+gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )

 {
 {

-    if (g_isIdle) 
+    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;
         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;

-    
+

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


@@ -208,15 +234,27 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
        decor |= GDK_DECOR_RESIZEH;
     }
 
        decor |= GDK_DECOR_RESIZEH;
     }
 

-    

     gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
     gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
     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->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's shrinking/growing policy */
     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);

+
+    /* set size hints */
+    gint flag =        GDK_HINT_POS;
+    if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
+    if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
+    if (flag)
+    {
+        gdk_window_set_hints( win->m_widget->window, 
+                             win->m_x, win->m_y,
+                             win->GetMinWidth(), win->GetMinHeight(),
+                             win->GetMaxWidth(), win->GetMaxHeight(),
+                             flag );
+    }

     
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     
     /* reset the icon */
     if (win->m_icon != wxNullIcon)


@@ -225,7 +263,7 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
         win->m_icon = wxNullIcon;
         win->SetIcon( icon );
     }
         win->m_icon = wxNullIcon;
         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? */
     wxWindowList::Node *node = win->GetChildren().GetFirst();
     /* we set the focus to the child that accepts the focus. this
        doesn't really have to be done in "realize" but why not? */
     wxWindowList::Node *node = win->GetChildren().GetFirst();


@@ -237,13 +275,13 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
             child->SetFocus();
             break;
         }
             child->SetFocus();
             break;
         }

-        
+

         node = node->GetNext();
     }
         node = node->GetNext();
     }

-    
+

     return FALSE;
 }
     return FALSE;
 }

-    
+

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


@@ -255,6 +293,8 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {
 
 static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 {

+    wxASSERT( GTK_IS_WIDGET(child->m_widget) );
+    

     if (!parent->m_insertInClientArea)
     {
         /* these are outside the client area */
     if (!parent->m_insertInClientArea)
     {
         /* these are outside the client area */


@@ -265,7 +305,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
                          child->m_y,
                          child->m_width,
                          child->m_height );
                          child->m_y,
                          child->m_width,
                          child->m_height );

-                         
+
+#if wxUSE_TOOLBAR

         /* we connect to these events for recalculating the client area
            space when the toolbar is floating */
         if (wxIS_KIND_OF(child,wxToolBar))
         /* we connect to these events for recalculating the client area
            space when the toolbar is floating */
         if (wxIS_KIND_OF(child,wxToolBar))


@@ -275,11 +316,12 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
             {
                 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 );
             }
         }

+#endif // wxUSE_TOOLBAR

     }
     else
     {
     }
     else
     {


@@ -302,6 +344,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)

+    EVT_IDLE(wxFrame::OnIdle)

     EVT_CLOSE(wxFrame::OnCloseWindow)
     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
     EVT_CLOSE(wxFrame::OnCloseWindow)
     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()


@@ -311,8 +354,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 void wxFrame::Init()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;
 void wxFrame::Init()
 {
     m_frameMenuBar = (wxMenuBar *) NULL;

+#if wxUSE_STATUSBAR

     m_frameStatusBar = (wxStatusBar *) NULL;
     m_frameStatusBar = (wxStatusBar *) NULL;

+#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR

     m_frameToolBar = (wxToolBar *) NULL;
     m_frameToolBar = (wxToolBar *) NULL;

+#endif // wxUSE_TOOLBAR

     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;
     m_sizeSet = FALSE;
     m_miniEdge = 0;
     m_miniTitle = 0;


@@ -320,6 +367,7 @@ void wxFrame::Init()
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_insertInClientArea = TRUE;
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_insertInClientArea = TRUE;

+    m_isFrame = TRUE;

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


@@ -327,7 +375,7 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       long style, const wxString &name )
 {
     Init();
       long style, const wxString &name )
 {
     Init();

-    
+

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


@@ -339,22 +387,27 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_needParent = FALSE;
 
 
     m_needParent = FALSE;
 

-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxFrame creation failed") );
+       return FALSE;
+    }

 
     m_title = title;
 
     m_title = title;

-    
+

     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 
     GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
 
     m_widget = gtk_window_new( win_type );
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
 
     GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
     if (style & wxSIMPLE_BORDER) win_type = GTK_WINDOW_POPUP;
 
     m_widget = gtk_window_new( win_type );

-    
+

     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
 
 #ifdef __WXDEBUG__
     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
 
 #ifdef __WXDEBUG__

-    debug_focus_in( m_widget, _T("wxFrame::m_widget"), name );
+    debug_focus_in( m_widget, wxT("wxFrame::m_widget"), name );

 #endif
 
     gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
 #endif
 
     gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );


@@ -368,18 +421,18 @@ 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 );

-    
+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    debug_focus_in( m_mainWidget, _T("wxFrame::m_mainWidget"), name );
+    debug_focus_in( m_mainWidget, wxT("wxFrame::m_mainWidget"), name );

 #endif
 
     /* m_wxwindow only represents the client area without toolbar and menubar */
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 #endif
 
     /* m_wxwindow only represents the client area without toolbar and menubar */
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );

-    
+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    debug_focus_in( m_wxwindow, _T("wxFrame::m_wxwindow"), name );
+    debug_focus_in( m_wxwindow, wxT("wxFrame::m_wxwindow"), name );

 #endif
 
     /* we donm't allow the frame to get the focus as otherwise
 #endif
 
     /* we donm't allow the frame to get the focus as otherwise


@@ -388,16 +441,16 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     if (m_parent) m_parent->AddChild( this );
 
 
     if (m_parent) m_parent->AddChild( 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 );
+

     PostCreation();
 
     /*  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 );
     PostCreation();
 
     /*  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 );

-    
-    /* 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 only way to get the window size is to connect to this event */
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
 
     /* the only way to get the window size is to connect to this event */
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",


@@ -409,15 +462,19 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 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;

-    
+
+#if wxUSE_STATUSBAR

     if (m_frameStatusBar) delete m_frameStatusBar;
     m_frameStatusBar = (wxStatusBar *) NULL;
     if (m_frameStatusBar) delete m_frameStatusBar;
     m_frameStatusBar = (wxStatusBar *) NULL;

-    
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR

     if (m_frameToolBar) delete m_frameToolBar;
     m_frameToolBar = (wxToolBar *) NULL;
     if (m_frameToolBar) delete m_frameToolBar;
     m_frameToolBar = (wxToolBar *) NULL;

+#endif // wxUSE_TOOLBAR

 
     wxTopLevelWindows.DeleteObject( this );
 
 
     wxTopLevelWindows.DeleteObject( this );
 


@@ -430,7 +487,7 @@ wxFrame::~wxFrame()
 
 bool wxFrame::Show( bool show )
 {
 
 bool wxFrame::Show( bool show )
 {

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

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


@@ -447,7 +504,7 @@ bool wxFrame::Show( bool show )
 
 bool wxFrame::Destroy()
 {
 
 bool wxFrame::Destroy()
 {

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

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


@@ -456,13 +513,13 @@ 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), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("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), _T("invalid frame") );
-    
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
+

     /* avoid recursions */
     /* avoid recursions */

-    if (m_resizing) return; 
+    if (m_resizing) return;

     m_resizing = TRUE;
 
     int old_x = m_x;
     m_resizing = TRUE;
 
     int old_x = m_x;


@@ -470,7 +527,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
     int old_width = m_width;
     int old_height = m_height;
 
     int old_width = m_width;
     int old_height = m_height;
 

-    if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+    if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)

     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;


@@ -521,7 +578,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), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

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


@@ -534,7 +591,7 @@ void wxFrame::Centre( int direction )
 
 void wxFrame::DoGetClientSize( 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), wxT("invalid frame") );

 
     wxWindow::DoGetClientSize( width, height );
     if (height)
 
     wxWindow::DoGetClientSize( width, height );
     if (height)


@@ -542,15 +599,18 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
         /* menu bar */
         if (m_frameMenuBar)
         {
         /* menu bar */
         if (m_frameMenuBar)
         {

-            if (!m_menuBarDetached) 
+            if (!m_menuBarDetached)

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

-        
+
+#if wxUSE_STATUSBAR

         /* status bar */
         if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
         /* status bar */
         if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;

-        
+#endif
+
+#if wxUSE_TOOLBAR

         /* tool bar */
         if (m_frameToolBar)
         {
         /* tool bar */
         if (m_frameToolBar)
         {


@@ -563,7 +623,8 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
             else
                 (*height) -= wxPLACE_HOLDER;
         }
             else
                 (*height) -= wxPLACE_HOLDER;
         }

-        
+#endif
+

         /* mini edge */
         (*height) -= m_miniEdge*2 + m_miniTitle;
     }
         /* mini edge */
         (*height) -= m_miniEdge*2 + m_miniTitle;
     }


@@ -575,20 +636,23 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 void wxFrame::DoSetClientSize( int width, int height )
 {
 
 void wxFrame::DoSetClientSize( int width, int height )
 {

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

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

-            if (!m_menuBarDetached) 
+            if (!m_menuBarDetached)

                 height += wxMENU_HEIGHT;
             else
                 height += wxPLACE_HOLDER;
         }
                 height += wxMENU_HEIGHT;
             else
                 height += wxPLACE_HOLDER;
         }

-        
+
+#if wxUSE_STATUSBAR

         /* status bar */
         if (m_frameStatusBar) height += wxSTATUS_HEIGHT;
         /* status bar */
         if (m_frameStatusBar) height += wxSTATUS_HEIGHT;

-        
+#endif
+
+#if wxUSE_TOOLBAR

         /* tool bar */
         if (m_frameToolBar)
         {
         /* tool bar */
         if (m_frameToolBar)
         {


@@ -601,7 +665,8 @@ void wxFrame::DoSetClientSize( int width, int height )
             else
                 height += wxPLACE_HOLDER;
         }
             else
                 height += wxPLACE_HOLDER;
         }

-        
+#endif
+

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


@@ -616,13 +681,13 @@ 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), _T("invalid frame") );
-    
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
+

     m_width = width;
     m_height = height;
 
     /* space occupied by m_frameToolBar and m_frameMenuBar */
     m_width = width;
     m_height = height;
 
     /* space occupied by m_frameToolBar and m_frameMenuBar */

-    int client_area_y_offset = 0; 
+    int client_area_y_offset = 0;

 
     /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
        wxWindow::Create to create it's GTK equivalent. m_mainWidget is only
 
     /* wxMDIChildFrame derives from wxFrame but it _is_ a wxWindow as it uses
        wxWindow::Create to create it's GTK equivalent. m_mainWidget is only


@@ -630,7 +695,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
        have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
        skip the part which handles m_frameMenuBar, m_frameToolBar and (most
        importantly) m_mainWidget */
        have here. if m_mainWidget is NULL it is a wxMDIChildFrame and so we
        skip the part which handles m_frameMenuBar, m_frameToolBar and (most
        importantly) m_mainWidget */

-       
+

     if (m_mainWidget)
     {
         /* check if size is in legal range */
     if (m_mainWidget)
     {
         /* check if size is in legal range */


@@ -644,7 +709,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
          * m_wxwindow.
          * this hurts in the eye, but I don't want to call SetSize()
          * because I don't want to call any non-native functions here. */
          * m_wxwindow.
          * this hurts in the eye, but I don't want to call SetSize()
          * because I don't want to call any non-native functions here. */

-     
+

         if (m_frameMenuBar)
         {
             int xx = m_miniEdge;
         if (m_frameMenuBar)
         {
             int xx = m_miniEdge;


@@ -656,42 +721,44 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
             m_frameMenuBar->m_y = yy;
             m_frameMenuBar->m_width = ww;
             m_frameMenuBar->m_height = hh;
             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, 
+            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                                  m_frameMenuBar->m_widget,

                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }

-    
+
+#if wxUSE_TOOLBAR

         if (m_frameToolBar)
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             if (m_frameMenuBar)
             {
         if (m_frameToolBar)
         {
             int xx = m_miniEdge;
             int yy = m_miniEdge + m_miniTitle;
             if (m_frameMenuBar)
             {

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

                     yy += wxPLACE_HOLDER;
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;
                     yy += wxPLACE_HOLDER;
             }
             int ww = m_width - 2*m_miniEdge;
             int hh = m_frameToolBar->m_height;

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

             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
             /* m_frameToolBar->m_height = hh;   don't change the toolbar's height */
             m_frameToolBar->m_width = ww;
             m_frameToolBar->m_x = xx;
             m_frameToolBar->m_y = yy;
             /* 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, 
+            gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                                  m_frameToolBar->m_widget,

                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }
                                   xx, yy, ww, hh );
             client_area_y_offset += hh;
         }

-    
+#endif
+

         int client_x = m_miniEdge;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_w = m_width - 2*m_miniEdge;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;
         int client_x = m_miniEdge;
         int client_y = client_area_y_offset + m_miniEdge + m_miniTitle;
         int client_w = m_width - 2*m_miniEdge;
         int client_h = m_height - client_area_y_offset- 2*m_miniEdge - m_miniTitle;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget), 
-                              m_wxwindow, 
+        gtk_myfixed_set_size( GTK_MYFIXED(m_mainWidget),
+                              m_wxwindow,

                               client_x, client_y, client_w, client_h );
     }
     else
                               client_x, client_y, client_w, client_h );
     }
     else


@@ -699,7 +766,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         /* 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. */
     }
         /* 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. */
     }

-    
+
+#if wxUSE_STATUSBAR

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


@@ -710,22 +778,24 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;
         m_frameStatusBar->m_y = yy;
         m_frameStatusBar->m_width = ww;
         m_frameStatusBar->m_height = hh;

-        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow), 
-                              m_frameStatusBar->m_widget, 
+        gtk_myfixed_set_size( GTK_MYFIXED(m_wxwindow),
+                              m_frameStatusBar->m_widget,

                               xx, yy, ww, hh );
     }
                               xx, yy, ww, hh );
     }

+#endif

 
     /* we actually set the size of a frame here and no-where else */
     gtk_widget_set_usize( m_widget, m_width, m_height );
 
     /* we actually set the size of a frame here and no-where else */
     gtk_widget_set_usize( m_widget, m_width, m_height );

-    
-    m_sizeSet = TRUE;

 
 

-    /* send size event to frame */
+
+    m_sizeSet = TRUE;
+    
+    // send size event to frame

     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 

-    /* send size event to status bar */
+    // send size event to status bar

     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
     if (m_frameStatusBar)
     {
         wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );


@@ -747,13 +817,24 @@ void wxFrame::MakeModal( bool modal )
 void wxFrame::OnInternalIdle()
 {
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
 void wxFrame::OnInternalIdle()
 {
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))

+    {

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

+       
+       // we'll come back later
+        if (g_isIdle)
+            wxapp_install_idle_handler();
+       return;
+    }

 
 

-    DoMenuUpdates();
-    

     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();

+#if wxUSE_TOOLBAR

     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();
     if (m_frameToolBar) m_frameToolBar->OnInternalIdle();

+#endif
+#if wxUSE_STATUSBAR

     if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();
     if (m_frameStatusBar) m_frameStatusBar->OnInternalIdle();

+#endif
+
+    wxWindow::OnInternalIdle();

 }
 
 void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
 }
 
 void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )


@@ -763,13 +844,15 @@ void wxFrame::OnCloseWindow( wxCloseEvent& WXUNUSED(event) )
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
 
 void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 {

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

 
 

+#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
     {
         Layout();
     }
     else
     if (GetAutoLayout())
     {
         Layout();
     }
     else

+#endif // wxUSE_CONSTRAINTS

     {
         /* do we have exactly one child? */
         wxWindow *child = (wxWindow *)NULL;
     {
         /* do we have exactly one child? */
         wxWindow *child = (wxWindow *)NULL;


@@ -799,65 +882,37 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     }
 }
 
     }
 }
 

-static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
-{
-    menu->SetInvokingWindow( win );
-    
-#if (GTK_MINOR_VERSION > 0)
-    /* support for native hot keys  */
-    gtk_accel_group_attach( menu->m_accel, GTK_OBJECT(win->m_widget));
-#endif
-
-    wxNode *node = menu->GetItems().First();
-    while (node)
-    {
-        wxMenuItem *menuitem = (wxMenuItem*)node->Data();
-        if (menuitem->IsSubMenu())
-            SetInvokingWindow( menuitem->GetSubMenu(), win );
-        node = node->Next();
-    }
-}
-

 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {
 void wxFrame::SetMenuBar( wxMenuBar *menuBar )
 {

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

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

-#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
-        /* support for native key accelerators indicated by underscroes */
-         gtk_accel_group_attach( m_frameMenuBar->m_accel, GTK_OBJECT(m_widget));
-#endif
-
-        wxNode *node = m_frameMenuBar->GetMenus().First();
-        while (node)
-        {
-            wxMenu *menu = (wxMenu*)node->Data();
-            SetInvokingWindow( menu, this );
-            node = node->Next();
-        }
+        m_frameMenuBar->SetInvokingWindow( this );

 
         if (m_frameMenuBar->GetParent() != this)
         {
             m_frameMenuBar->SetParent(this);
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),
 
         if (m_frameMenuBar->GetParent() != this)
         {
             m_frameMenuBar->SetParent(this);
             gtk_myfixed_put( GTK_MYFIXED(m_mainWidget),

-                m_frameMenuBar->m_widget, 
-                m_frameMenuBar->m_x, 
+                m_frameMenuBar->m_widget,
+                m_frameMenuBar->m_x,

                 m_frameMenuBar->m_y,
                 m_frameMenuBar->m_width,
                 m_frameMenuBar->m_height );
                 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 );
             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_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 );
             }

+           
+           m_frameMenuBar->Show( TRUE );

         }
     }
 
         }
     }
 


@@ -872,6 +927,7 @@ wxMenuBar *wxFrame::GetMenuBar() const
 
 void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {
 
 void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 {

+#if wxUSE_STATUSBAR

     if (GetStatusBar())
     {
         // if no help string found, we will clear the status bar text
     if (GetStatusBar())
     {
         // if no help string found, we will clear the status bar text


@@ -889,20 +945,22 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 
         SetStatusText(helpString);
     }
 
         SetStatusText(helpString);
     }

+#endif // wxUSE_STATUSBAR

 }
 
 }
 

+#if wxUSE_TOOLBAR

 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), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

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

 
     m_insertInClientArea = FALSE;
 
     m_insertInClientArea = FALSE;

-    
+

     m_frameToolBar = OnCreateToolBar( style, id, name );
 
     if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );
     m_frameToolBar = OnCreateToolBar( style, id, name );
 
     if (m_frameToolBar) GetChildren().DeleteObject( m_frameToolBar );

-    
+

     m_insertInClientArea = TRUE;
 
     m_sizeSet = FALSE;
     m_insertInClientArea = TRUE;
 
     m_sizeSet = FALSE;


@@ -915,16 +973,38 @@ wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString&
     return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
 }
 
     return new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
 }
 

+void wxFrame::SetToolBar(wxToolBar *toolbar) 
+{ 
+    m_frameToolBar = toolbar; 
+    if (m_frameToolBar)
+    {
+        /* insert into toolbar area if not already there */
+        if (m_frameToolBar->m_widget->parent != m_mainWidget)
+        {
+           gtk_widget_ref( m_frameToolBar->m_widget );
+           gtk_widget_unparent( m_frameToolBar->m_widget );
+           
+            m_insertInClientArea = TRUE;
+           wxInsertChildInFrame( this, m_frameToolBar );
+            m_insertInClientArea = FALSE;
+           
+           gtk_widget_unref( m_frameToolBar->m_widget );
+       }
+    }
+}
+

 wxToolBar *wxFrame::GetToolBar() const
 {
     return m_frameToolBar;
 }
 wxToolBar *wxFrame::GetToolBar() const
 {
     return m_frameToolBar;
 }

+#endif // wxUSE_TOOLBAR

 
 

+#if wxUSE_STATUSBAR

 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), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

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

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


@@ -954,61 +1034,62 @@ wxStatusBar *wxFrame::OnCreateStatusBar( int number, long style, wxWindowID id,
     return statusBar;
 }
 
     return statusBar;
 }
 

-void wxFrame::Command( int id )
+wxStatusBar *wxFrame::GetStatusBar() const

 {
 {

-    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-    commandEvent.SetInt( id );
-    commandEvent.SetEventObject( this );
-
-    wxMenuBar *bar = GetMenuBar();
-    if (!bar) return;
-
-    wxMenuItem *item = bar->FindItemForId(id) ;
-    if (item && item->IsCheckable())
-    {
-        bar->Check(id,!bar->Checked(id)) ;
-    }
-
-    wxEvtHandler* evtHandler = GetEventHandler();
-
-    evtHandler->ProcessEvent(commandEvent);
+    return m_frameStatusBar;

 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {
 }
 
 void wxFrame::SetStatusText(const wxString& text, int number)
 {

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

 
 

-    wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("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), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
 

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

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

+#endif // wxUSE_STATUSBAR

 
 

-wxStatusBar *wxFrame::GetStatusBar() const
+void wxFrame::Command( int id )

 {
 {

-    return m_frameStatusBar;
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetInt( id );
+    commandEvent.SetEventObject( this );
+
+    wxMenuBar *bar = GetMenuBar();
+    if (!bar) return;
+
+    wxMenuItem *item = bar->FindItemForId(id) ;
+    if (item && item->IsCheckable())
+    {
+        bar->Check(id,!bar->Checked(id)) ;
+    }
+
+    wxEvtHandler* evtHandler = GetEventHandler();
+
+    evtHandler->ProcessEvent(commandEvent);

 }
 
 void wxFrame::SetTitle( const wxString &title )
 {
 }
 
 void wxFrame::SetTitle( const wxString &title )
 {

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

 
     m_title = title;
 
     m_title = title;

-    if (m_title.IsNull()) m_title = _T("");
+    if (m_title.IsNull()) m_title = wxT("");

     gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )
 {
     gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )
 {

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

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


@@ -1022,3 +1103,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 

+void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+{
+}
+
+void wxFrame::Restore() 
+{
+}
+
+void wxFrame::Iconize( bool iconize ) 
+{ 
+   if (iconize)
+   {
+        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
+                       GDK_WINDOW_XWINDOW( m_widget->window ),
+                       DefaultScreen( GDK_DISPLAY() ) );
+   }
+}
+
+bool wxFrame::IsIconized() const 
+{ 
+    return FALSE; 
+}