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);
// 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)));
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;
}
+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+ // No maximizing in Motif (?)
+ return FALSE;
+}
+
void wxFrame::SetTitle(const wxString& title)
{
if (title == m_title)
{
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);
}
// Currently can't set it twice
- wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
-
- m_frameMenuBar = menuBar;
-
- Widget menuBarW = XmCreateMenuBar ((Widget) m_frameWidget, "MenuBar", NULL, 0);
- m_frameMenuBar->SetMainWidget( (WXWidget) menuBarW);
+// wxASSERT_MSG( (m_frameMenuBar == (wxMenuBar*) NULL), "Cannot set the menubar more than once");
- 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,
void wxFrame::ChangeBackgroundColour()
{
- // TODO
+ if (GetClientWidget())
+ DoChangeBackgroundColour(GetClientWidget(), m_backgroundColour);
}
void wxFrame::ChangeForegroundColour()
{
- // TODO
+ if (GetClientWidget())
+ DoChangeForegroundColour(GetClientWidget(), m_foregroundColour);
}
void wxCloseFrameCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs)
projects / wxWidgets.git / blobdiff