Removed #pragma implementation "appbase.h" which caused duplicate symbols

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 07944b9b68e5b6868901a4b8dc54bf96337a1921..539fb6c9b7e03984ad78264d45c438dc855315c5 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -71,10 +71,20 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
     if (g_isIdle)
         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))
     {
+/*
+        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();
@@ -233,6 +243,19 @@ gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
     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)
     {
@@ -321,6 +344,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
 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()
@@ -343,6 +367,7 @@ void wxFrame::Init()
     m_menuBarDetached = FALSE;
     m_toolBarDetached = FALSE;
     m_insertInClientArea = TRUE;
+    m_isFrame = TRUE;
 }
 
 wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -365,7 +390,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( _T("wxFrame creation failed") );
+        wxFAIL_MSG( wxT("wxFrame creation failed") );
        return FALSE;
     }
 
@@ -382,7 +407,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
         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() );
@@ -398,7 +423,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
 
 #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 */
@@ -407,7 +432,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
 
 #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
@@ -416,6 +441,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     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
@@ -423,10 +452,6 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     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",
         GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
@@ -462,7 +487,7 @@ wxFrame::~wxFrame()
 
 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)
     {
@@ -479,7 +504,7 @@ bool wxFrame::Show( bool show )
 
 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);
 
@@ -488,10 +513,10 @@ bool wxFrame::Destroy()
 
 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 */
-    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     /* avoid recursions */
     if (m_resizing) return;
@@ -553,7 +578,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 
 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;
@@ -566,7 +591,7 @@ void wxFrame::Centre( int direction )
 
 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)
@@ -611,7 +636,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const
 
 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)
@@ -656,7 +681,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 */
-    wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid frame") );
+    wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     m_width = width;
     m_height = height;
@@ -762,14 +787,15 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int 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 );
 
-    /* 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() );
@@ -791,9 +817,14 @@ void wxFrame::MakeModal( bool modal )
 void wxFrame::OnInternalIdle()
 {
     if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
+    {
         GtkOnSize( m_x, m_y, m_width, m_height );
-
-    DoMenuUpdates();
+       
+       // we'll come back later
+        if (g_isIdle)
+            wxapp_install_idle_handler();
+       return;
+    }
 
     if (m_frameMenuBar) m_frameMenuBar->OnInternalIdle();
 #if wxUSE_TOOLBAR
@@ -813,7 +844,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent& 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())
@@ -853,8 +884,8 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 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;
 
@@ -920,9 +951,9 @@ void wxFrame::OnMenuHighlight(wxMenuEvent& event)
 #if wxUSE_TOOLBAR
 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;
 
@@ -942,6 +973,26 @@ wxToolBar* wxFrame::OnCreateToolBar( long style, wxWindowID id, const wxString&
     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;
@@ -951,9 +1002,9 @@ wxToolBar *wxFrame::GetToolBar() const
 #if wxUSE_STATUSBAR
 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 );
 
@@ -990,18 +1041,18 @@ wxStatusBar *wxFrame::GetStatusBar() const
 
 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[] )
 {
-    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);
 }
@@ -1029,16 +1080,16 @@ void wxFrame::Command( int id )
 
 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;
-    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 )
 {
-    wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     m_icon = icon;
     if (!icon.Ok()) return;