/////////////////////////////////////////////////////////////////////////////
-// Name: mdi.cpp
+// Name: src/motif/mdi.cpp
// Purpose: MDI classes
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "mdi.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/mdi.h"
-#include "wx/menu.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/menu.h"
+ #include "wx/icon.h"
+ #include "wx/settings.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
int w, h;
GetClientSize(& w, & h);
m_clientWindow->SetSize(0, 0, w, h);
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
wxMDIParentFrame::~wxMDIParentFrame()
// Stops the same event being processed repeatedly
static wxEventType inEvent = wxEVT_NULL;
if (inEvent == event.GetEventType())
- return FALSE;
+ return false;
inEvent = event.GetEventType();
- bool res = FALSE;
+ bool res = false;
if (m_activeChild && event.IsKindOf(CLASSINFO(wxCommandEvent)))
{
- res = m_activeChild->GetEventHandler()->ProcessEvent(event);
+ res = m_activeChild->HandleWindowEvent(event);
}
if (!res)
// TODO
}
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation WXUNUSED(orient))
{
// TODO
}
if (GetStatusBar())
{
if (event.GetMenuId() == -1)
- SetStatusText("");
+ SetStatusText(wxEmptyString);
else
{
wxMenuBar *menuBar = (wxMenuBar*) NULL;
if (menuBar)
{
wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
- if (helpString != "")
+ if (!helpString.empty())
SetStatusText(helpString);
}
}
SetName(name);
SetWindowStyleFlag(style);
- m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
- m_foregroundColour = *wxBLACK;
- m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-
if ( id > -1 )
m_windowId = id;
else
wxMDIClientWindow* clientWindow = parent->GetClientWindow();
- wxASSERT_MSG( (clientWindow != (wxWindow*) NULL), "Missing MDI client window.");
+ wxCHECK_MSG( clientWindow, false, "Missing MDI client window." );
- if (clientWindow) clientWindow->AddChild(this);
+ clientWindow->AddChild(this);
SetMDIParentFrame(parent);
+ PreCreation();
int width = size.x;
int height = size.y;
wxMDIChildFrame* oldActiveChild = parent->GetActiveChild();
if (oldActiveChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
- oldActiveChild->GetEventHandler()->ProcessEvent(event);
+ oldActiveChild->HandleWindowEvent(event);
}
// This is the currently active child
XmNresizePolicy, XmRESIZE_NONE,
NULL);
- XtAddEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+ XtAddEventHandler((Widget) m_mainWidget, ExposureMask,False,
wxUniversalRepaintProc, (XtPointer) this);
- SetCanAddEventHandler(TRUE);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
- ChangeBackgroundColour();
-
XtManageChild((Widget) m_mainWidget);
SetTitle(title);
- clientWindow->AddPage(this, title, TRUE);
+ clientWindow->AddPage(this, title, true);
clientWindow->Refresh();
// Positions the toolbar and status bar -- but we don't have any.
// PreResize();
wxModelessWindows.Append(this);
- return TRUE;
+ return true;
}
wxMDIChildFrame::~wxMDIChildFrame()
{
if (m_mainWidget)
- XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,FALSE,
+ XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask,False,
wxUniversalRepaintProc, (XtPointer) this);
if (GetMDIParentFrame())
wxMDIClientWindow* clientWindow = parentFrame->GetClientWindow();
// Remove page if still there
- if (clientWindow->RemovePage(this))
- clientWindow->Refresh();
+ {
+ int i = clientWindow->FindPage(this);
+
+ if (i != -1)
+ {
+ clientWindow->RemovePage(i);
+ clientWindow->Refresh();
+ }
+ }
// Set the selection to the first remaining page
if (clientWindow->GetPageCount() > 0)
if (oldActiveChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
- oldActiveChild->GetEventHandler()->ProcessEvent(event);
+ oldActiveChild->HandleWindowEvent(event);
}
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, this->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, true, this->GetId());
event.SetEventObject( this );
- this->GetEventHandler()->ProcessEvent(event);
+ this->HandleWindowEvent(event);
}
void wxMDIChildFrame::OnLower()
if (oldActiveChild == this)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldActiveChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldActiveChild->GetId());
event.SetEventObject( oldActiveChild );
- oldActiveChild->GetEventHandler()->ProcessEvent(event);
+ oldActiveChild->HandleWindowEvent(event);
}
// TODO: unfortunately we don't now know which is the top-most child,
// so make the active child NULL.
#endif
// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
void wxMDIChildFrame::DoSetClientSize(int width, int height)
{
wxWindow::DoSetClientSize(width, height);
bool wxMDIChildFrame::Show(bool show)
{
- m_visibleStatus = show; /* show-&-hide fix */
+ SetVisibleStatus( show );
return wxWindow::Show(show);
}
// Set icon
void wxMDIChildFrame::SetIcon(const wxIcon& icon)
{
- m_icon = icon;
- if (m_icon.Ok())
+ m_icons = wxIconBundle( icon );
+
+ if (icon.Ok())
{
// Not appropriate since there are no icons in
// a tabbed window
}
}
+void wxMDIChildFrame::SetIcons(const wxIconBundle& icons)
+{
+ m_icons = icons;
+}
+
void wxMDIChildFrame::SetTitle(const wxString& title)
{
- m_title = title;
+ wxTopLevelWindow::SetTitle( title );
wxMDIClientWindow* clientWindow = GetMDIParentFrame()->GetClientWindow();
- int pageNo = clientWindow->FindPagePosition(this);
- if (pageNo > -1)
- clientWindow->SetPageText(pageNo, title);
+
+ // Remove page if still there
+ {
+ int i = clientWindow->FindPage(this);
+
+ if (i != -1)
+ clientWindow->SetPageText(i, title);
+ }
}
// MDI operations
bool wxMDIChildFrame::IsIconized() const
{
- return FALSE;
+ return false;
}
// Is it maximized? Always maximized under Motif, using the
// tabbed MDI implementation.
bool wxMDIChildFrame::IsMaximized(void) const
{
- return TRUE;
+ return true;
}
void wxMDIChildFrame::Restore()
wxWindow::Raise();
}
-void wxMDIChildFrame::SetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
+void wxMDIChildFrame::DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), int WXUNUSED(maxH), int WXUNUSED(incW), int WXUNUSED(incH))
{
}
{
SetWindowStyleFlag(style);
- // m_windowParent = parent;
- // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0, 0), wxSize(100, 100), 0);
if (success)
{
- wxFont font(10, wxSWISS, wxNORMAL, wxNORMAL);
- wxFont selFont(10, wxSWISS, wxNORMAL, wxBOLD);
- GetTabView()->SetTabFont(font);
- GetTabView()->SetSelectedTabFont(selFont);
- GetTabView()->SetTabSize(120, 18);
- GetTabView()->SetTabSelectionHeight(20);
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
+}
+
+int wxMDIClientWindow::FindPage(const wxNotebookPage* page)
+{
+ for (int i = GetPageCount() - 1; i >= 0; --i)
+ {
+ if (GetPage(i) == page)
+ return i;
+ }
+
+ return -1;
}
void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
wxWindow::DoGetPosition(x, y);
}
-// Explicitly call default scroll behaviour
-void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))
+void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
{
- Default(); // Default processing
+ // Default(); // Default processing: OBSOLETE FUNCTION
+ event.Skip();
}
-void wxMDIClientWindow::OnPageChanged(wxNotebookEvent& event)
+void wxMDIClientWindow::OnPageChanged(wxBookCtrlEvent& event)
{
// Notify child that it has been activated
if (event.GetOldSelection() != -1)
wxMDIChildFrame* oldChild = (wxMDIChildFrame*) GetPage(event.GetOldSelection());
if (oldChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, oldChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, false, oldChild->GetId());
event.SetEventObject( oldChild );
- oldChild->GetEventHandler()->ProcessEvent(event);
+ oldChild->HandleWindowEvent(event);
}
}
if (event.GetSelection() != -1)
wxMDIChildFrame* activeChild = (wxMDIChildFrame*) GetPage(event.GetSelection());
if (activeChild)
{
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, activeChild->GetId());
+ wxActivateEvent event(wxEVT_ACTIVATE, true, activeChild->GetId());
event.SetEventObject( activeChild );
- activeChild->GetEventHandler()->ProcessEvent(event);
+ activeChild->HandleWindowEvent(event);
if (activeChild->GetMDIParentFrame())
{
projects / wxWidgets.git / blobdiff