X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb1585ae85bc09432ae4c1afd805fb4aebf6e0c8..681be2ef80274e6c39b243922a594c59e4983dab:/src/gtk1/mdi.cpp diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp index 541afecfe8..e2cb0b3765 100644 --- a/src/gtk1/mdi.cpp +++ b/src/gtk1/mdi.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.cpp +// Name: src/gtk1/mdi.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,67 +7,101 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "mdi.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_MDI #include "wx/mdi.h" -#include "wx/dialog.h" -#include "wx/menu.h" -#include "wx/gtk/win_gtk.h" -#include + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/menu.h" + #include "wx/dialog.h" +#endif + +#include "wx/notebook.h" +#include "wx/gtk1/private.h" + +#include +#include +#include +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- -const int wxMENU_HEIGHT = 30; +const int wxMENU_HEIGHT = 27; //----------------------------------------------------------------------------- -// globals +// idle system //----------------------------------------------------------------------------- -extern wxList wxPendingDelete; +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- -// "size_allocate" +// globals //----------------------------------------------------------------------------- -static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) -{ - if ((win->m_x == alloc->x) && - (win->m_y == alloc->y) && - (win->m_width == alloc->width) && - (win->m_height == alloc->height)) - { - return; - } - - win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); -} - //----------------------------------------------------------------------------- -// page change callback +// "switch_page" //----------------------------------------------------------------------------- -static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget), - GtkNotebookPage *page, - gint WXUNUSED(nPage), - wxMDIClientWindow *client_win ) +extern "C" { +static void +gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget), + GtkNotebookPage *page, + gint WXUNUSED(page_num), + wxMDIParentFrame *parent ) { - wxNode *node = client_win->m_children.First(); - while (node) - { - wxMDIChildFrame *child_frame = (wxMDIChildFrame *)node->Data(); - if (child_frame->m_page == page) + if (g_isIdle) + wxapp_install_idle_handler(); + + // send deactivate event to old child + + wxMDIChildFrame *child = parent->GetActiveChild(); + if (child) { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)client_win->m_parent; - mdi_frame->m_currentChild = child_frame; - mdi_frame->SetMDIMenuBar( child_frame->m_menuBar ); - return; + wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() ); + event1.SetEventObject( child); + child->HandleWindowEvent( event1 ); } - node = node->Next(); - } + + // send activate event to new child + + wxMDIClientWindowBase * const client_window = parent->GetClientWindow(); + if ( !client_window ) + return; + + child = NULL; + + wxWindowList::compatibility_iterator node = client_window->GetChildren().GetFirst(); + while (node) + { + wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame ); + // CE: we come here in the destructor with a null child_frame - I think because + // gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", (see below) + // isn't deleted early enough + if (!child_frame) + return ; + + if (child_frame->m_page == page) + { + child = child_frame; + break; + } + node = node->GetNext(); + } + + if (!child) + return; + + wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() ); + event2.SetEventObject( child); + child->HandleWindowEvent( event2 ); +} } //----------------------------------------------------------------------------- @@ -76,113 +110,190 @@ static void gtk_page_change_callback( GtkNotebook *WXUNUSED(widget), IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame,wxFrame) -BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) -END_EVENT_TABLE() - -wxMDIParentFrame::wxMDIParentFrame(void) +void wxMDIParentFrame::Init() { - m_clientWindow = (wxMDIClientWindow *) NULL; - m_currentChild = (wxMDIChildFrame *) NULL; - m_parentFrameActive = TRUE; + m_justInserted = false; + m_clientWindow = NULL; } -wxMDIParentFrame::wxMDIParentFrame( wxWindow *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +bool wxMDIParentFrame::Create(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { - m_clientWindow = (wxMDIClientWindow *) NULL; - m_currentChild = (wxMDIChildFrame *) NULL; - m_parentFrameActive = TRUE; - Create( parent, id, title, pos, size, style, name ); -} + if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) ) + return false; -wxMDIParentFrame::~wxMDIParentFrame(void) -{ + m_clientWindow = OnCreateClient(); + if ( !m_clientWindow->CreateClient(this, GetWindowStyleFlag()) ) + return false; + + return true; } -bool wxMDIParentFrame::Create( wxWindow *parent, - wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name ) +void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) { - wxFrame::Create( parent, id, title, pos, size, style, name ); + wxFrame::GtkOnSize( x, y, width, height ); - OnCreateClient(); + wxMDIChildFrame *child_frame = GetActiveChild(); + if (!child_frame) return; - return TRUE; -} + wxMenuBar *menu_bar = child_frame->m_menuBar; + if (!menu_bar) return; + if (!menu_bar->m_widget) return; -void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height ) -{ - wxFrame::GtkOnSize( x, y, width, height ); - - if (m_mdiMenuBar) - { - m_mdiMenuBar->m_x = 1; - m_mdiMenuBar->m_y = 1; - m_mdiMenuBar->m_width = m_width-2; - m_mdiMenuBar->m_height = wxMENU_HEIGHT-2; - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 ); - gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 ); - } + menu_bar->m_x = 0; + menu_bar->m_y = 0; + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); } -void wxMDIParentFrame::SetMDIMenuBar( wxMenuBar *menu_bar ) +void wxMDIParentFrame::OnInternalIdle() { - if (m_mdiMenuBar) m_mdiMenuBar->Show( FALSE ); - m_mdiMenuBar = menu_bar; - if (m_mdiMenuBar) - { - m_mdiMenuBar->m_x = 1; - m_mdiMenuBar->m_y = 1; - m_mdiMenuBar->m_width = m_width-2; - m_mdiMenuBar->m_height = wxMENU_HEIGHT-2; - gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_mdiMenuBar->m_widget, 1, 1 ); - gtk_widget_set_usize( m_mdiMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 ); - m_mdiMenuBar->Show( TRUE ); - } -} + /* if a an MDI child window has just been inserted + it has to be brought to the top in idle time. we + simply set the last notebook page active as new + pages can only be appended at the end */ -void wxMDIParentFrame::GetClientSize(int *width, int *height ) const -{ - wxFrame::GetClientSize( width, height ); -} + if (m_justInserted) + { + GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); + gtk_notebook_set_page( notebook, g_list_length( notebook->children ) - 1 ); + + /* need to set the menubar of the child */ + wxMDIChildFrame *active_child_frame = GetActiveChild(); + if (active_child_frame != NULL) + { + wxMenuBar *menu_bar = active_child_frame->m_menuBar; + if (menu_bar) + { + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + menu_bar->Attach(active_child_frame); + } + } + m_justInserted = false; + return; + } -wxMDIChildFrame *wxMDIParentFrame::GetActiveChild(void) const -{ - return m_currentChild; -} + wxFrame::OnInternalIdle(); -wxMDIClientWindow *wxMDIParentFrame::GetClientWindow(void) const -{ - return m_clientWindow; -} + wxMDIChildFrame *active_child_frame = GetActiveChild(); + bool visible_child_menu = false; -wxMDIClientWindow *wxMDIParentFrame::OnCreateClient(void) -{ - m_clientWindow = new wxMDIClientWindow( this ); - return m_clientWindow; -} + wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst(); + while (node) + { + wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame ); + + if ( child_frame ) + { + wxMenuBar *menu_bar = child_frame->m_menuBar; + if ( menu_bar ) + { + if (child_frame == active_child_frame) + { + if (menu_bar->Show(true)) + { + menu_bar->m_width = m_width; + menu_bar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + menu_bar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + + // Attach() asserts if we call it for an already + // attached menu bar so don't do it if we're already + // associated with this frame (it would be nice to get + // rid of this check and ensure that this doesn't + // happen...) + if ( menu_bar->GetFrame() != child_frame ) + menu_bar->Attach( child_frame ); + } + visible_child_menu = true; + } + else + { + if (menu_bar->Show(false)) + { + menu_bar->Detach(); + } + } + } + } + + node = node->GetNext(); + } -void wxMDIParentFrame::ActivateNext(void) -{ - if (m_clientWindow) - gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); + /* show/hide parent menu bar as required */ + if ((m_frameMenuBar) && + (m_frameMenuBar->IsShown() == visible_child_menu)) + { + if (visible_child_menu) + { + m_frameMenuBar->Show( false ); + m_frameMenuBar->Detach(); + } + else + { + m_frameMenuBar->Show( true ); + m_frameMenuBar->Attach( this ); + + m_frameMenuBar->m_width = m_width; + m_frameMenuBar->m_height = wxMENU_HEIGHT; + gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), + m_frameMenuBar->m_widget, + 0, 0, m_width, wxMENU_HEIGHT ); + } + } } -void wxMDIParentFrame::ActivatePrevious(void) +wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const { - if (m_clientWindow) - gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); + if (!m_clientWindow) return NULL; + + GtkNotebook *notebook = GTK_NOTEBOOK(m_clientWindow->m_widget); + if (!notebook) return NULL; + + gint i = gtk_notebook_get_current_page( notebook ); + if (i < 0) return NULL; + + GtkNotebookPage* page = (GtkNotebookPage*) (g_list_nth(notebook->children,i)->data); + if (!page) return NULL; + + wxWindowList::compatibility_iterator node = m_clientWindow->GetChildren().GetFirst(); + while (node) + { + wxMDIChildFrame *child_frame = wxDynamicCast( node->GetData(), wxMDIChildFrame ); + + wxASSERT_MSG( child_frame, wxT("child is not a wxMDIChildFrame") ); + + if (child_frame->m_page == page) + return child_frame; + node = node->GetNext(); + } + + return NULL; } -void wxMDIParentFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) +void wxMDIParentFrame::ActivateNext() { + if (m_clientWindow) + gtk_notebook_next_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); } -void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(event) ) +void wxMDIParentFrame::ActivatePrevious() { + if (m_clientWindow) + gtk_notebook_prev_page( GTK_NOTEBOOK(m_clientWindow->m_widget) ); } //----------------------------------------------------------------------------- @@ -190,112 +301,125 @@ void wxMDIParentFrame::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(eve //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame,wxFrame) - + BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame) - EVT_ACTIVATE(wxMDIChildFrame::OnActivate) + EVT_ACTIVATE(wxMDIChildFrame::OnActivate) + EVT_MENU_HIGHLIGHT_ALL(wxMDIChildFrame::OnMenuHighlight) END_EVENT_TABLE() -wxMDIChildFrame::wxMDIChildFrame(void) +void wxMDIChildFrame::Init() { - m_menuBar = (wxMenuBar *) NULL; - m_page = (GtkNotebookPage *) NULL; + m_menuBar = NULL; + m_page = NULL; } -wxMDIChildFrame::wxMDIChildFrame( wxMDIParentFrame *parent, +bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, wxWindowID id, const wxString& title, const wxPoint& WXUNUSED(pos), const wxSize& size, long style, const wxString& name ) { - m_menuBar = (wxMenuBar *) NULL; - m_page = (GtkNotebookPage *) NULL; - Create( parent, id, title, wxDefaultPosition, size, style, name ); + m_title = title; + + return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); } -wxMDIChildFrame::~wxMDIChildFrame(void) +wxMDIChildFrame::~wxMDIChildFrame() { - if (m_menuBar) - { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; - if (mdi_frame->m_currentChild == this) - { - mdi_frame->SetMDIMenuBar( (wxMenuBar *) NULL ); - mdi_frame->m_currentChild = (wxMDIChildFrame *) NULL; - } delete m_menuBar; - } } -bool wxMDIChildFrame::Create( wxMDIParentFrame *parent, - wxWindowID id, const wxString& title, - const wxPoint& WXUNUSED(pos), const wxSize& size, - long style, const wxString& name ) +void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) { - m_title = title; - - return wxWindow::Create( parent->GetClientWindow(), id, wxDefaultPosition, size, style, name ); + wxASSERT_MSG( m_menuBar == NULL, wxT("Only one menubar allowed") ); + + m_menuBar = menu_bar; + + if (m_menuBar) + { + wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent(); + + m_menuBar->SetParent( mdi_frame ); + + /* insert the invisible menu bar into the _parent_ mdi frame */ + gtk_pizza_put( GTK_PIZZA(mdi_frame->m_mainWidget), + m_menuBar->m_widget, + 0, 0, mdi_frame->m_width, wxMENU_HEIGHT ); + } } -void wxMDIChildFrame::GetClientSize( int *width, int *height ) const +wxMenuBar *wxMDIChildFrame::GetMenuBar() const { - wxWindow::GetClientSize( width, height ); + return m_menuBar; } -void wxMDIChildFrame::AddChild( wxWindow *child ) +GtkNotebook *wxMDIChildFrame::GTKGetNotebook() const { - wxWindow::AddChild( child ); + wxMDIClientWindow * const + client = wxStaticCast(GetParent(), wxMDIClientWindow); + wxCHECK( client, NULL ); + + return GTK_NOTEBOOK(client->m_widget); } - -static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) + +void wxMDIChildFrame::Activate() { - menu->SetInvokingWindow( win ); - wxNode *node = menu->m_items.First(); - while (node) - { - wxMenuItem *menuitem = (wxMenuItem*)node->Data(); - if (menuitem->IsSubMenu()) - SetInvokingWindow( menuitem->GetSubMenu(), win ); - node = node->Next(); - } + GtkNotebook * const notebook = GTKGetNotebook(); + wxCHECK_RET( notebook, "no parent notebook?" ); + + gint pageno = gtk_notebook_page_num( notebook, m_widget ); + gtk_notebook_set_page( notebook, pageno ); } -void wxMDIChildFrame::SetMenuBar( wxMenuBar *menu_bar ) +void wxMDIChildFrame::OnActivate( wxActivateEvent& WXUNUSED(event) ) { - m_menuBar = menu_bar; - - if (m_menuBar) - { - wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->m_parent; +} - if (m_menuBar->m_parent != this) +void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event ) +{ +#if wxUSE_STATUSBAR + wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent(); + if ( !ShowMenuHelp(event.GetMenuId()) ) { - wxNode *node = m_menuBar->m_menus.First(); - while (node) - { - wxMenu *menu = (wxMenu*)node->Data(); - SetInvokingWindow( menu, this ); - node = node->Next(); - } - - m_menuBar->m_parent = mdi_frame; + // we don't have any help text for this item, but may be the MDI frame + // does? + mdi_frame->OnMenuHighlight(event); } - mdi_frame->SetMDIMenuBar( m_menuBar ); - - gtk_myfixed_put( GTK_MYFIXED(mdi_frame->m_wxwindow), - m_menuBar->m_widget, m_menuBar->m_x, m_menuBar->m_y ); - } +#endif // wxUSE_STATUSBAR } -wxMenuBar *wxMDIChildFrame::GetMenuBar() +void wxMDIChildFrame::SetTitle( const wxString &title ) { - return m_menuBar; -} + if ( title == m_title ) + return; -void wxMDIChildFrame::Activate(void) -{ + m_title = title; + + GtkNotebook * const notebook = GTKGetNotebook(); + wxCHECK_RET( notebook, "no parent notebook?" ); + + gtk_notebook_set_tab_label_text(notebook, m_widget, wxGTK_CONV( title ) ); } -void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) +//----------------------------------------------------------------------------- +// "size_allocate" +//----------------------------------------------------------------------------- + +extern "C" { +static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) { + if (g_isIdle) wxapp_install_idle_handler(); + + if ((win->m_x == alloc->x) && + (win->m_y == alloc->y) && + (win->m_width == alloc->width) && + (win->m_height == alloc->height) && + (win->m_sizeSet)) + { + return; + } + + win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height ); +} } //----------------------------------------------------------------------------- @@ -304,24 +428,23 @@ void wxMDIChildFrame::OnActivate( wxActivateEvent &WXUNUSED(event) ) static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* child ) { - wxString s = child->m_title; - if (s.IsNull()) s = _("MDI child"); + wxString s = child->GetTitle(); + if (s.IsNull()) s = _("MDI child"); + + GtkWidget *label_widget = gtk_label_new( s.mbc_str() ); + gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 ); + + gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", + GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - GtkWidget *label_widget = gtk_label_new( s ); - gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 ); + GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - gtk_signal_connect( GTK_OBJECT(child->m_widget), "size_allocate", - GTK_SIGNAL_FUNC(gtk_page_size_callback), (gpointer)child ); - - GtkNotebook *notebook = GTK_NOTEBOOK(parent->m_widget); - - gtk_notebook_append_page( notebook, child->m_widget, label_widget ); + gtk_notebook_append_page( notebook, child->m_widget, label_widget ); - child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); + child->m_page = (GtkNotebookPage*) (g_list_last(notebook->children)->data); - gtk_notebook_set_page( notebook, parent->m_children.Number()-1 ); - - gtk_page_change_callback( (GtkNotebook *) NULL, child->m_page, 0, parent ); + wxMDIParentFrame *parent_frame = (wxMDIParentFrame*) parent->GetParent(); + parent_frame->m_justInserted = true; } //----------------------------------------------------------------------------- @@ -330,42 +453,33 @@ static void wxInsertChildInMDI( wxMDIClientWindow* parent, wxMDIChildFrame* chil IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow,wxWindow) -wxMDIClientWindow::wxMDIClientWindow(void) -{ -} - -wxMDIClientWindow::wxMDIClientWindow( wxMDIParentFrame *parent, long style ) -{ - CreateClient( parent, style ); -} - -wxMDIClientWindow::~wxMDIClientWindow(void) -{ -} - bool wxMDIClientWindow::CreateClient( wxMDIParentFrame *parent, long style ) { - m_needParent = TRUE; - - m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; + m_needParent = true; - PreCreation( parent, -1, wxPoint(10,10), wxSize(100,100), style, "wxMDIClientWindow" ); + m_insertCallback = (wxInsertChildFunction)wxInsertChildInMDI; - m_widget = gtk_notebook_new(); + if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || + !CreateBase( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style, wxDefaultValidator, wxT("wxMDIClientWindow") )) + { + wxFAIL_MSG( wxT("wxMDIClientWindow creation failed") ); + return false; + } - gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", - GTK_SIGNAL_FUNC(gtk_page_change_callback), (gpointer)this ); + m_widget = gtk_notebook_new(); - gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); + gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", + GTK_SIGNAL_FUNC(gtk_mdi_page_change_callback), (gpointer)parent ); - gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); - - PostCreation(); + gtk_notebook_set_scrollable( GTK_NOTEBOOK(m_widget), 1 ); - Show( TRUE ); + m_parent->DoAddChild( this ); - return TRUE; -} + PostCreation(); + Show( true ); + return true; +} +#endif