#include "wx/motif/private.h"
void wxCloseFrameCallback(Widget, XtPointer, XmAnyCallbackStruct *cbs);
-static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+void wxFrameFocusProc(Widget workArea, XtPointer clientData,
XmAnyCallbackStruct *cbs);
static void wxFrameMapProc(Widget frameShell, XtPointer clientData,
XCrossingEvent * event);
m_visibleStatus = TRUE;
m_title = "";
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+ m_foregroundColour = *wxBLACK;
+ m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
if ( id > -1 )
m_windowId = id;
m_mainWidget = m_frameWidget;
+ ChangeFont(FALSE);
+
// This patch comes from Torsten Liermann lier@lier1.muc.de
if (XmIsMotifWMRunning( (Widget) m_frameShell ))
{
#endif
#endif
+ ChangeBackgroundColour();
+
PreResize();
wxSizeEvent sizeEvent(wxSize(width, height), GetId());
if (m_frameMenuBar)
{
+ m_frameMenuBar->DestroyMenuBar();
+
// Hack to stop core dump on Ultrix, OSF, for some strange reason.
#if MOTIF_MENUBAR_DELETE_FIX
GetMenuBar()->SetMainWidget((WXWidget) NULL);
XtDestroyWidget (statusLineWidget);
*/
- wxDeleteWindowFromTable((Widget) m_workArea);
+ if (m_workArea)
+ {
+ wxDeleteWindowFromTable((Widget) m_workArea);
- XtDestroyWidget ((Widget) m_workArea);
- XtDestroyWidget ((Widget) m_frameWidget);
+ XtDestroyWidget ((Widget) m_workArea);
+ }
- wxDeleteWindowFromTable((Widget) m_frameWidget);
+ if (m_frameWidget)
+ {
+ wxDeleteWindowFromTable((Widget) m_frameWidget);
+ XtDestroyWidget ((Widget) m_frameWidget);
+ }
- XtDestroyWidget ((Widget) m_frameShell);
+ if (m_frameShell)
+ XtDestroyWidget ((Widget) m_frameShell);
SetMainWidget((WXWidget) NULL);
Dimension xx, yy;
XtVaGetValues((Widget) m_workArea, XmNwidth, &xx, XmNheight, &yy, NULL);
- /* TODO
- if (status_line_exists)
+ if (m_frameStatusBar)
{
- Dimension ys;
- XtVaGetValues(statusLineWidget, XmNheight, &ys, NULL);
- yy -= ys;
+ int sbw, sbh;
+ m_frameStatusBar->GetSize(& sbw, & sbh);
+ yy -= sbh;
}
- */
-
+ if (m_frameToolBar)
+ {
+ int tbw, tbh;
+ m_frameToolBar->GetSize(& tbw, & tbh);
+ if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
+ xx -= tbw;
+ else
+ yy -= tbh;
+ }
+/*
if (GetMenuBar() != (wxMenuBar*) NULL)
{
// it seems that if a frame holds a panel, the menu bar size
// gets automatically taken care of --- grano@cs.helsinki.fi 4.4.95
bool hasSubPanel = FALSE;
- for(wxNode* node = GetChildren()->First(); node; node = node->Next())
+ for(wxNode* node = GetChildren().First(); node; node = node->Next())
{
wxWindow *win = (wxWindow *)node->Data();
hasSubPanel = (win->IsKindOf(CLASSINFO(wxPanel)) && !win->IsKindOf(CLASSINFO(wxDialog)));
yy -= ys;
}
}
+ */
*x = xx; *y = yy;
}
if (height > -1)
{
- /* TODO
- if (status_line_exists)
+ if (m_frameStatusBar)
{
- Dimension ys;
- XtVaGetValues(statusLineWidget, XmNheight, &ys, NULL);
- height += ys;
+ int sbw, sbh;
+ m_frameStatusBar->GetSize(& sbw, & sbh);
+ height += sbh;
+ }
+ if (m_frameToolBar)
+ {
+ int tbw, tbh;
+ m_frameToolBar->GetSize(& tbw, & tbh);
+ if (m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL)
+ width += tbw;
+ else
+ height += tbh;
}
- */
+
XtVaSetValues((Widget) m_workArea, XmNheight, height, NULL);
}
PreResize();
if (!(height == -1 && width == -1))
{
PreResize();
+ /* JACS: not sure if this is necessary
wxSizeEvent sizeEvent(wxSize(width, height), GetId());
sizeEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(sizeEvent);
+ */
}
}
bool wxFrame::Show(bool show)
{
+ if (!m_frameShell)
+ return wxWindow::Show(show);
+
m_visibleStatus = show; /* show-&-hide fix */
m_isShown = show;
if (!iconize)
Show(TRUE);
- XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
+ if (m_frameShell)
+ XtVaSetValues((Widget) m_frameShell, XmNiconic, (Boolean)iconize, NULL);
}
// Equivalent to maximize/restore in Windows
{
Show(TRUE);
- if (maximize)
+ if (maximize && m_frameShell)
XtVaSetValues((Widget) m_frameShell, XmNiconic, FALSE, NULL);
}
bool wxFrame::IsIconized() const
{
+ if (!m_frameShell)
+ return FALSE;
+
Boolean iconic;
XtVaGetValues((Widget) m_frameShell, XmNiconic, &iconic, NULL);
return iconic;
{
m_icon = icon;
- // TODO
- /*
+ if (!m_frameShell)
+ return;
+
if (!icon.Ok() || !icon.GetPixmap())
return;
- XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon->.GetPixmap(), NULL);
- */
+ XtVaSetValues((Widget) m_frameShell, XtNiconPixmap, icon.GetPixmap(), NULL);
}
wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
- dc.SetFont(* statusBar->GetFont());
+ dc.SetFont(statusBar->GetFont());
long x, y;
dc.GetTextExtent("X", &x, &y);
// Since we wish the status bar to be directly under the client area,
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
- m_frameStatusBar->SetSize(0-sh, h, w, sh);
+ m_frameStatusBar->SetSize(0, h, w, sh);
}
WXWidget wxFrame::GetMenuBarWidget() const
}
// Currently can't set it twice
- wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
-
- m_frameMenuBar = menuBar;
+// wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
- Widget menuBarW = XmCreateMenuBar ((Widget) m_frameWidget, "MenuBar", NULL, 0);
- m_frameMenuBar->SetMainWidget( (WXWidget) menuBarW);
-
- int i;
- for (i = 0; i < menuBar->GetMenuCount(); i++)
+ if (m_frameMenuBar)
{
- wxMenu *menu = menuBar->GetMenu(i);
- wxString title(menuBar->m_titles[i]);
- menu->SetButtonWidget(menu->CreateMenu (menuBar, menuBarW, menu, title, TRUE));
-
- /*
- * COMMENT THIS OUT IF YOU DON'T LIKE A RIGHT-JUSTIFIED HELP MENU
- */
- wxStripMenuCodes ((char*) (const char*) title, wxBuffer);
-
- if (strcmp (wxBuffer, "Help") == 0)
- XtVaSetValues ((Widget) menuBarW, XmNmenuHelpWidget, (Widget) menu->GetButtonWidget(), NULL);
+ m_frameMenuBar->DestroyMenuBar();
+ delete m_frameMenuBar;
}
- XtRealizeWidget ((Widget) menuBarW);
- XtManageChild ((Widget) menuBarW);
- menuBar->SetMenuBarFrame(this);
+ m_frameMenuBar = menuBar;
+ m_frameMenuBar->CreateMenuBar(this);
}
void wxFrame::Fit()
{
// Work out max. size
- wxNode *node = GetChildren()->First();
+ wxNode *node = GetChildren().First();
int max_width = 0;
int max_height = 0;
while (node)
// do we have _exactly_ one child?
wxWindow *child = NULL;
- for ( wxNode *node = GetChildren()->First(); node; node = node->Next() )
+ for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
{
wxWindow *win = (wxWindow *)node->Data();
if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
- for(wxNode *node = GetChildren()->First(); node; node = node->Next())
+ for(wxNode *node = GetChildren().First(); node; node = node->Next())
{
// Find a child that's a subwindow, but not a dialog box.
wxWindow *child = (wxWindow *)node->Data();
if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
!child->IsKindOf(CLASSINFO(wxDialog)))
{
-#if WXDEBUG > 1
- wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n");
-#endif
child->SetFocus();
return;
}
return pt;
}
+void wxFrame::ScreenToClient(int *x, int *y) const
+{
+ wxWindow::ScreenToClient(x, y);
+
+ // We may be faking the client origin.
+ // So a window that's really at (0, 30) may appear
+ // (to wxWin apps) to be at (0, 0).
+ wxPoint pt(GetClientAreaOrigin());
+ *x -= pt.x;
+ *y -= pt.y;
+}
+
+void wxFrame::ClientToScreen(int *x, int *y) const
+{
+ // We may be faking the client origin.
+ // So a window that's really at (0, 30) may appear
+ // (to wxWin apps) to be at (0, 0).
+ wxPoint pt1(GetClientAreaOrigin());
+ *x += pt1.x;
+ *y += pt1.y;
+
+ wxWindow::ClientToScreen(x, y);
+}
+
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
{
- return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+ return new wxToolBar(this, id, wxPoint(0, 0), wxSize(100, 24), style, name);
}
void wxFrame::PositionToolBar()
{
int cw, ch;
- // TODO: we actually need to use the low-level client size, before
- // the toolbar/status bar were added.
- // So DEFINITELY replace the line below with something appropriate.
-
GetClientSize(& cw, &ch);
- if ( GetStatusBar() )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- ch -= statusY;
- }
-
if (GetToolBar())
{
int tw, th;
// Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
// means, pretend we don't have toolbar/status bar, so we
// have the original client size.
- GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS);
+ GetToolBar()->SetSize(0, 0, tw, ch + th, wxSIZE_NO_ADJUSTMENTS);
}
else
{
wxToolBar *wxFrame::GetToolBar() const
{ return m_frameToolBar; }
-static void wxFrameFocusProc(Widget workArea, XtPointer clientData,
+void wxFrameFocusProc(Widget workArea, XtPointer clientData,
XmAnyCallbackStruct *cbs)
{
wxFrame *frame = (wxFrame *)clientData;
//// Motif-specific
bool wxFrame::PreResize()
{
+ PositionToolBar();
PositionStatusBar();
return TRUE;
}
return m_clientArea;
}
+void wxFrame::ChangeFont(bool keepOriginalSize)
+{
+ // TODO
+}
+
+void wxFrame::ChangeBackgroundColour()
+{
+ if (GetClientWidget())
+ DoChangeBackgroundColour(GetClientWidget(), m_backgroundColour);
+}
+
+void wxFrame::ChangeForegroundColour()
+{
+ if (GetClientWidget())
+ DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
+}
+
void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
{
wxFrame *frame = (wxFrame *)client_data;
// May delete the frame (with delayed deletion)
frame->GetEventHandler()->ProcessEvent(closeEvent);
}
+
projects / wxWidgets.git / blobdiff