X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c75e66953f7e46b9a488fd5a4aa1ec726621b13f..33fed835142587adf031acd66535b63fd0e5a553:/src/motif/dialog.cpp diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index 3aad3f823b..cfd12bece7 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -6,7 +6,7 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -19,6 +19,9 @@ #include "wx/app.h" #include "wx/settings.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include @@ -38,11 +41,13 @@ #if XmVersion > 1000 #include #endif +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" static void wxCloseDialogCallback(Widget widget, XtPointer client_data, XmAnyCallbackStruct *cbs); -static void wxDialogBoxRepaintProc(Widget w, XtPointer c_data, XEvent *event, char *); static void wxDialogBoxEventHandler (Widget wid, XtPointer client_data, XEvent* event, @@ -63,19 +68,18 @@ extern wxList wxPendingDelete; #define wxUSE_INVISIBLE_RESIZE 1 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) -EVT_BUTTON(wxID_OK, wxDialog::OnOK) -EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) -EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) -EVT_CHAR_HOOK(wxDialog::OnCharHook) -EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) -EVT_CLOSE(wxDialog::OnCloseWindow) + EVT_SIZE(wxDialog::OnSize) + EVT_BUTTON(wxID_OK, wxDialog::OnOK) + EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) + EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CHAR_HOOK(wxDialog::OnCharHook) + EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) + EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { @@ -93,43 +97,43 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, m_windowStyle = style; m_modalShowing = FALSE; m_dialogTitle = title; - + m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); m_foregroundColour = *wxBLACK; - + SetName(name); - + if (!parent) wxTopLevelWindows.Append(this); - + if (parent) parent->AddChild(this); - + if ( id == -1 ) m_windowId = (int)NewControlId(); else m_windowId = id; - + Widget parentWidget = (Widget) 0; if (parent) parentWidget = (Widget) parent->GetTopWidget(); if (!parent) parentWidget = (Widget) wxTheApp->GetTopLevelWidget(); - + wxASSERT_MSG( (parentWidget != (Widget) 0), "Could not find a suitable parent shell for dialog." ); - + Arg args[2]; XtSetArg (args[0], XmNdefaultPosition, False); XtSetArg (args[1], XmNautoUnmanage, False); Widget dialogShell = XmCreateBulletinBoardDialog(parentWidget, (char*) (const char*) name, args, 2); m_mainWidget = (WXWidget) dialogShell; - + // We don't want margins, since there is enough elsewhere. XtVaSetValues(dialogShell, XmNmarginHeight, 0, XmNmarginWidth, 0, XmNresizePolicy, XmRESIZE_NONE, NULL) ; - + Widget shell = XtParent(dialogShell) ; if (!title.IsNull()) { @@ -139,21 +143,21 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, NULL); XmStringFree(str); } - - m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + + m_font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); ChangeFont(FALSE); - + wxAddWindowToTable(dialogShell, this); - + // Intercept CLOSE messages from the window manager Atom WM_DELETE_WINDOW = XmInternAtom(XtDisplay(shell), "WM_DELETE_WINDOW", False); - + /* Remove and add WM_DELETE_WINDOW so ours is only handler */ /* Why do we have to do this for wxDialog, but not wxFrame? */ XmRemoveWMProtocols(shell, &WM_DELETE_WINDOW, 1); XmAddWMProtocols(shell, &WM_DELETE_WINDOW, 1); XmActivateWMProtocol(shell, WM_DELETE_WINDOW); - + // Modified Steve Hammes for Motif 2.0 #if (XmREVISION > 1 || XmVERSION > 1) XmAddWMProtocolCallback(shell, WM_DELETE_WINDOW, (XtCallbackProc) wxCloseDialogCallback, (XtPointer)this); @@ -162,14 +166,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, #else XmAddWMProtocolCallback(shell, WM_DELETE_WINDOW, (void (*)())wxCloseDialogCallback, (caddr_t)this); #endif - + XtTranslations ptr ; XtOverrideTranslations(dialogShell, ptr = XtParseTranslationTable(": resize()")); XtFree((char *)ptr); - + // Can't remember what this was about... but I think it's necessary. - + if (wxUSE_INVISIBLE_RESIZE) { if (pos.x > -1) @@ -178,13 +182,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, if (pos.y > -1) XtVaSetValues(dialogShell, XmNy, pos.y, NULL); - + if (size.x > -1) XtVaSetValues(dialogShell, XmNwidth, size.x, NULL); if (size.y > -1) XtVaSetValues(dialogShell, XmNheight, size.y, NULL); } - + // This patch come from Torsten Liermann lier@lier1.muc.de if (XmIsMotifWMRunning(shell)) { @@ -203,7 +207,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, decor |= MWM_DECOR_MINIMIZE; if (m_windowStyle & wxMAXIMIZE_BOX) decor |= MWM_DECOR_MAXIMIZE; - + XtVaSetValues(shell,XmNmwmDecorations,decor,NULL) ; } // This allows non-Motif window managers to support at least the @@ -213,34 +217,34 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, if ((m_windowStyle & wxCAPTION) != wxCAPTION) XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL); } - + XtRealizeWidget(dialogShell); - + XtAddCallback(dialogShell,XmNunmapCallback, (XtCallbackProc)wxUnmapBulletinBoard,this) ; - + // Positioning of the dialog doesn't work properly unless the dialog // is managed, so we manage without mapping to the screen. // To show, we map the shell (actually it's parent). if (!wxUSE_INVISIBLE_RESIZE) XtVaSetValues(shell, XmNmappedWhenManaged, FALSE, NULL); - + if (!wxUSE_INVISIBLE_RESIZE) { XtManageChild(dialogShell); SetSize(pos.x, pos.y, size.x, size.y); } XtAddEventHandler(dialogShell,ExposureMask,FALSE, - wxDialogBoxRepaintProc, (XtPointer) this); - + wxUniversalRepaintProc, (XtPointer) this); + XtAddEventHandler(dialogShell, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask, FALSE, wxDialogBoxEventHandler, (XtPointer)this); - + ChangeBackgroundColour(); - + return TRUE; } @@ -251,7 +255,7 @@ void wxDialog::SetModal(bool flag) else if ( m_windowStyle & wxDIALOG_MODAL ) m_windowStyle -= wxDIALOG_MODAL ; - + wxModelessWindows.DeleteObject(this); if (!flag) wxModelessWindows.Append(this); @@ -259,52 +263,48 @@ void wxDialog::SetModal(bool flag) wxDialog::~wxDialog() { + m_isBeingDeleted = TRUE; + + if (m_mainWidget) + XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE, + wxUniversalRepaintProc, (XtPointer) this); + m_modalShowing = FALSE; if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget) { XtUnmapWidget((Widget) m_mainWidget); } - + wxTopLevelWindows.DeleteObject(this); - + if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) wxModelessWindows.DeleteObject(this); - + // If this is the last top-level window, exit. if (wxTheApp && (wxTopLevelWindows.Number() == 0)) { wxTheApp->SetTopWindow(NULL); - + if (wxTheApp->GetExitOnFrameDelete()) { wxTheApp->ExitMainLoop(); } } - + // This event-flushing code used to be in wxWindow::PostDestroyChildren (wx_dialog.cpp) // but I think this should work, if we destroy the children first. // Note that this might need to be done for wxFrame also. DestroyChildren(); - - // This causes a crash in e.g. the resource sample when closing - // the example dialog. TODO: Probably not necessary (?) -#if 0 - // Now process all events, because otherwise - // this might remain on the screen. - Display* display; - if (m_mainWidget) - display = XtDisplay((Widget) m_mainWidget); - else - display = (Display*) wxGetDisplay(); - - XSync(display, FALSE); - XEvent event; - while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) { - XFlush(display); - XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); - XtDispatchEvent(&event); + + // The idea about doing it here is that if you have to remove the + // XtDestroyWidget from ~wxWindow, at least top-level windows + // will still be deleted (and destroy children implicitly). + if (GetMainWidget()) + { + DetachWidget(GetMainWidget()); // Removes event handlers + XtDestroyWidget((Widget) GetMainWidget()); + SetMainWidget((WXWidget) NULL); } -#endif } // By default, pressing escape cancels the dialog @@ -317,7 +317,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event) wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); cancelEvent.SetEventObject( this ); GetEventHandler()->ProcessEvent(cancelEvent); - + return; } // We didn't process this event. @@ -331,6 +331,45 @@ void wxDialog::Iconize(bool WXUNUSED(iconize)) // XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL); } +// Default resizing behaviour - if only ONE subwindow, +// resize to client rectangle size +void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) +{ + // if we're using constraints - do use them +#if wxUSE_CONSTRAINTS + if ( GetAutoLayout() ) { + Layout(); + return; + } +#endif + + // do we have _exactly_ one child? + wxWindow *child = NULL; + for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) + { + wxWindow *win = (wxWindow *)node->Data(); + if ( !win->IsKindOf(CLASSINFO(wxFrame)) && + !win->IsKindOf(CLASSINFO(wxDialog)) ) + { + if ( child ) + return; // it's our second subwindow - nothing to do + child = win; + } + } + + if ( child ) { + // we have exactly one child - set it's size to fill the whole frame + int clientW, clientH; + GetClientSize(&clientW, &clientH); + + int x = 0; + int y = 0; + + child->SetSize(x, y, clientW, clientH); + } +} + + bool wxDialog::IsIconized() const { /* @@ -342,26 +381,25 @@ XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL); return FALSE; } -void wxDialog::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags) { XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL); - wxWindow::SetSize(x, y, width, height, sizeFlags); + wxWindow::DoSetSize(x, y, width, height, sizeFlags); XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_NONE, NULL); } -void wxDialog::SetClientSize(int width, int height) +void wxDialog::DoSetClientSize(int width, int height) { - SetSize(-1, -1, width, height); + wxWindow::SetSize(-1, -1, width, height); } - void wxDialog::SetTitle(const wxString& title) { m_dialogTitle = title; if (!title.IsNull()) { XmString str = XmStringCreateSimple((char*) (const char*) title); - XtVaSetValues((Widget) m_mainWidget, + XtVaSetValues((Widget) m_mainWidget, XmNtitle, (char*) (const char*) title, XmNdialogTitle, str, // Roberto Cocchi XmNiconName, (char*) (const char*) title, @@ -375,35 +413,6 @@ wxString wxDialog::GetTitle() const return m_dialogTitle; } -void wxDialog::Centre(int direction) -{ - int x_offset,y_offset ; - int display_width, display_height; - int width, height, x, y; - wxWindow *parent = GetParent(); - if ((direction & wxCENTER_FRAME) && parent) - { - parent->GetPosition(&x_offset,&y_offset) ; - parent->GetSize(&display_width,&display_height) ; - } - else - { - wxDisplaySize(&display_width, &display_height); - x_offset = 0 ; - y_offset = 0 ; - } - - GetSize(&width, &height); - GetPosition(&x, &y); - - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); - - SetSize(x+x_offset, y+y_offset, width, height); -} - void wxDialog::Raise() { Window parent_window = XtWindow((Widget) m_mainWidget), @@ -441,16 +450,16 @@ void wxDialog::Lower() bool wxDialog::Show(bool show) { m_isShown = show; - + if (show) { if (!wxUSE_INVISIBLE_RESIZE) XtMapWidget(XtParent((Widget) m_mainWidget)); else - XtManageChild((Widget) m_mainWidget) ; - + XtManageChild((Widget) m_mainWidget) ; + XRaiseWindow(XtDisplay((Widget) m_mainWidget), XtWindow((Widget) m_mainWidget)); - + } else { @@ -458,11 +467,11 @@ bool wxDialog::Show(bool show) XtUnmapWidget(XtParent((Widget) m_mainWidget)); else XtUnmanageChild((Widget) m_mainWidget) ; - + XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); } - + return TRUE; } @@ -470,43 +479,57 @@ bool wxDialog::Show(bool show) int wxDialog::ShowModal() { m_windowStyle |= wxDIALOG_MODAL; - + Show(TRUE); - + if (m_modalShowing) return 0; - + wxModalShowingStack.Insert((wxObject *)TRUE); - + m_modalShowing = TRUE; XtAddGrab((Widget) m_mainWidget, TRUE, FALSE); - + XEvent event; - + // Loop until we signal that the dialog should be closed while ((wxModalShowingStack.Number() > 0) && ((int)(wxModalShowingStack.First()->Data()) != 0)) { // XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); - + XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); wxTheApp->ProcessXEvent((WXEvent*) &event); + + if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0) + { + if (!wxTheApp->ProcessIdle()) + { +#if wxUSE_THREADS + // leave the main loop to give other threads a chance to + // perform their GUI work + wxMutexGuiLeave(); + wxUsleep(20); + wxMutexGuiEnter(); +#endif + } + } } - + // Remove modal dialog flag from stack wxNode *node = wxModalShowingStack.First(); if (node) delete node; - + // Now process all events in case they get sent to a destroyed dialog XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) { XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event); - + wxTheApp->ProcessXEvent((WXEvent*) &event); } - + // TODO: is it safe to call this, if the dialog may have been deleted // by now? Probably only if we're using delayed deletion of dialogs. return GetReturnCode(); @@ -516,16 +539,16 @@ void wxDialog::EndModal(int retCode) { if (!m_modalShowing) return; - + SetReturnCode(retCode); - + // Strangely, we don't seem to need this now. // XtRemoveGrab((Widget) m_mainWidget); - + Show(FALSE); - + m_modalShowing = FALSE; - + wxNode *node = wxModalShowingStack.First(); if (node) node->SetData((wxObject *)FALSE); @@ -564,35 +587,39 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) } } -bool wxDialog::OnClose() +void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - // Behaviour changed in 2.0: we'll send a Cancel message by default, + // We'll send a Cancel message by default, // which may close the dialog. - // Check for looping if the Cancel event handler calls Close() - + // Check for looping if the Cancel event handler calls Close(). + + // Note that if a cancel button and handler aren't present in the dialog, + // nothing will happen when you close the dialog via the window manager, or + // via Close(). + // We wouldn't want to destroy the dialog by default, since the dialog may have been + // created on the stack. + // However, this does mean that calling dialog->Close() won't delete the dialog + // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be + // sure to destroy the dialog. + // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog. + static wxList closing; - + if ( closing.Member(this) ) - return FALSE; - + return; + closing.Append(this); - + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - + GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog + closing.DeleteObject(this); - - return FALSE; } -void wxDialog::OnCloseWindow(wxCloseEvent& event) +void wxDialog::OnPaint(wxPaintEvent &WXUNUSED(event)) { - // Compatibility - if ( GetEventHandler()->OnClose() || event.GetForce()) - { - this->Destroy(); - } + // added for compatiblity only } // Destroy the window (delayed, if a managed window) @@ -609,68 +636,24 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) Refresh(); } -void wxDialog::Fit() -{ -} - // Handle a close event from the window manager -static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data, +static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data, XmAnyCallbackStruct *WXUNUSED(cbs)) { wxDialog *dialog = (wxDialog *)client_data; wxCloseEvent closeEvent(wxEVT_CLOSE_WINDOW, dialog->GetId()); closeEvent.SetEventObject(dialog); - + // May delete the dialog (with delayed deletion) dialog->GetEventHandler()->ProcessEvent(closeEvent); } -// TODO: Preferably, we should have a universal repaint proc. -// Meanwhile, use a special one for dialogs. -static void wxDialogBoxRepaintProc(Widget w, XtPointer WXUNUSED(c_data), XEvent *event, char *) -{ - Window window; - Display *display; - - wxWindow* win = (wxWindow *)wxWidgetHashTable->Get((long)w); - if (!win) - return; - - switch(event -> type) - { - case Expose : - { - window = (Window) win -> GetXWindow(); - display = (Display *) win -> GetXDisplay(); - - wxRect* rect = new wxRect(event->xexpose.x, event->xexpose.y, - event->xexpose.width, event->xexpose.height); - win->m_updateRects.Append((wxObject*) rect); - - if (event -> xexpose.count == 0) - { - wxPaintEvent event(win->GetId()); - event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); - - win->ClearUpdateRects(); - } - break; - } - default : - { - cout << "\n\nNew Event ! is = " << event -> type << "\n"; - break; - } - } -} - -static void wxDialogBoxEventHandler (Widget wid, - XtPointer WXUNUSED(client_data), - XEvent* event, - Boolean *continueToDispatch) +void wxDialogBoxEventHandler(Widget wid, + XtPointer WXUNUSED(client_data), + XEvent* event, + Boolean* continueToDispatch) { - wxDialog *dialog = (wxDialog *)wxWidgetHashTable->Get((long)wid); + wxDialog *dialog = (wxDialog *)wxGetWindowFromTable(wid); if (dialog) { wxMouseEvent wxevent(wxEVT_NULL); @@ -699,8 +682,16 @@ static void wxDialogBoxEventHandler (Widget wid, } else { - keyEvent.SetEventType(wxEVT_CHAR); - dialog->GetEventHandler()->ProcessEvent(keyEvent); + // For simplicity, OnKeyDown is the same as OnChar + // TODO: filter modifier key presses from OnChar + keyEvent.SetEventType(wxEVT_KEY_DOWN); + + // Only process OnChar if OnKeyDown didn't swallow it + if (!dialog->GetEventHandler()->ProcessEvent (keyEvent)) + { + keyEvent.SetEventType(wxEVT_CHAR); + dialog->GetEventHandler()->ProcessEvent(keyEvent); + } } } }