X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/793f619f7f0e5b1eaba6a9e3f731462c1893b7f7..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/motif/dialog.cpp?ds=sidebyside diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp index 6862e9a03a..19a321cc02 100644 --- a/src/motif/dialog.cpp +++ b/src/motif/dialog.cpp @@ -6,19 +6,29 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "dialog.h" #endif +#ifdef __VMS +#define XtDisplay XTDISPLAY +#define XtWindow XTWINDOW +#define XtParent XTPARENT +#define XtScreen XTSCREEN +#endif + #include "wx/dialog.h" #include "wx/utils.h" #include "wx/frame.h" #include "wx/app.h" #include "wx/settings.h" +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include #include @@ -38,15 +48,17 @@ #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, - Boolean *continueToDispatch); + XtPointer client_data, + XEvent* event, + Boolean *continueToDispatch); static void wxUnmapBulletinBoard(Widget dialog, wxDialog *client,XtPointer call); @@ -63,10 +75,10 @@ extern wxList wxPendingDelete; #define wxUSE_INVISIBLE_RESIZE 1 -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) + EVT_SIZE(wxDialog::OnSize) EVT_BUTTON(wxID_OK, wxDialog::OnOK) EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) @@ -75,30 +87,29 @@ BEGIN_EVENT_TABLE(wxDialog, wxPanel) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { m_modalShowing = FALSE; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); } bool wxDialog::Create(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { m_windowStyle = style; m_modalShowing = FALSE; m_dialogTitle = title; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE); + m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); m_foregroundColour = *wxBLACK; SetName(name); - + if (!parent) wxTopLevelWindows.Append(this); @@ -125,22 +136,22 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, // We don't want margins, since there is enough elsewhere. XtVaSetValues(dialogShell, - XmNmarginHeight, 0, - XmNmarginWidth, 0, - XmNresizePolicy, XmRESIZE_NONE, - NULL) ; + XmNmarginHeight, 0, + XmNmarginWidth, 0, + XmNresizePolicy, XmRESIZE_NONE, + NULL) ; Widget shell = XtParent(dialogShell) ; if (!title.IsNull()) { XmString str = XmStringCreateSimple((char*) (const char*)title); XtVaSetValues(dialogShell, - XmNdialogTitle, str, - NULL); + XmNdialogTitle, str, + NULL); XmStringFree(str); } - m_windowFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); + m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); ChangeFont(FALSE); wxAddWindowToTable(dialogShell, this); @@ -165,24 +176,24 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, XtTranslations ptr ; XtOverrideTranslations(dialogShell, - ptr = XtParseTranslationTable(": resize()")); + 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) - XtVaSetValues(dialogShell, XmNx, pos.x, - NULL); - 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); + if (pos.x > -1) + XtVaSetValues(dialogShell, XmNx, pos.x, + NULL); + 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 @@ -190,19 +201,19 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, { int decor = 0 ; if (m_windowStyle & wxRESIZE_BORDER) - decor |= MWM_DECOR_RESIZEH ; + decor |= MWM_DECOR_RESIZEH ; if (m_windowStyle & wxSYSTEM_MENU) - decor |= MWM_DECOR_MENU; + decor |= MWM_DECOR_MENU; if ((m_windowStyle & wxCAPTION) || (m_windowStyle & wxTINY_CAPTION_HORIZ) || (m_windowStyle & wxTINY_CAPTION_VERT)) - decor |= MWM_DECOR_TITLE; + decor |= MWM_DECOR_TITLE; if (m_windowStyle & wxTHICK_FRAME) - decor |= MWM_DECOR_BORDER; + decor |= MWM_DECOR_BORDER; if (m_windowStyle & wxMINIMIZE_BOX) - decor |= MWM_DECOR_MINIMIZE; + decor |= MWM_DECOR_MINIMIZE; if (m_windowStyle & wxMAXIMIZE_BOX) - decor |= MWM_DECOR_MAXIMIZE; + decor |= MWM_DECOR_MAXIMIZE; XtVaSetValues(shell,XmNmwmDecorations,decor,NULL) ; } @@ -210,14 +221,14 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, // no-decorations case. else { - if ((m_windowStyle & wxCAPTION) != wxCAPTION) - XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL); + if ((m_windowStyle & wxCAPTION) != wxCAPTION) + XtVaSetValues((Widget) shell,XmNoverrideRedirect,TRUE,NULL); } XtRealizeWidget(dialogShell); XtAddCallback(dialogShell,XmNunmapCallback, - (XtCallbackProc)wxUnmapBulletinBoard,this) ; + (XtCallbackProc)wxUnmapBulletinBoard,this) ; // Positioning of the dialog doesn't work properly unless the dialog // is managed, so we manage without mapping to the screen. @@ -231,13 +242,13 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, 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); + ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask, + FALSE, + wxDialogBoxEventHandler, + (XtPointer)this); ChangeBackgroundColour(); @@ -250,35 +261,41 @@ void wxDialog::SetModal(bool flag) m_windowStyle |= wxDIALOG_MODAL ; else if ( m_windowStyle & wxDIALOG_MODAL ) - m_windowStyle -= wxDIALOG_MODAL ; - - wxModelessWindows.DeleteObject(this); - if (!flag) - wxModelessWindows.Append(this); + m_windowStyle -= wxDIALOG_MODAL ; + + wxModelessWindows.DeleteObject(this); + if (!flag) + wxModelessWindows.Append(this); } 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); + XtUnmapWidget((Widget) m_mainWidget); } wxTopLevelWindows.DeleteObject(this); if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); + wxModelessWindows.DeleteObject(this); // If this is the last top-level window, exit. if (wxTheApp && (wxTopLevelWindows.Number() == 0)) { - wxTheApp->SetTopWindow(NULL); + wxTheApp->SetTopWindow(NULL); - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop(); - } + if (wxTheApp->GetExitOnFrameDelete()) + { + wxTheApp->ExitMainLoop(); + } } // This event-flushing code used to be in wxWindow::PostDestroyChildren (wx_dialog.cpp) @@ -286,133 +303,136 @@ wxDialog::~wxDialog() // Note that this might need to be done for wxFrame also. DestroyChildren(); - // 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); } } // By default, pressing escape cancels the dialog void wxDialog::OnCharHook(wxKeyEvent& event) { - if (event.m_keyCode == WXK_ESCAPE) - { - // Behaviour changed in 2.0: we'll send a Cancel message - // to the dialog instead of Close. - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - - return; - } - // We didn't process this event. - event.Skip(); + if (event.m_keyCode == WXK_ESCAPE) + { + // Behaviour changed in 2.0: we'll send a Cancel message + // to the dialog instead of Close. + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + cancelEvent.SetEventObject( this ); + GetEventHandler()->ProcessEvent(cancelEvent); + + return; + } + // We didn't process this event. + event.Skip(); } void wxDialog::Iconize(bool WXUNUSED(iconize)) { - // Can't iconize a dialog in Motif, apparently - // TODO: try using the parent of m_mainShell. -// XtVaSetValues((Widget) m_mainWidget, XmNiconic, iconize, NULL); + // Can't iconize a dialog in Motif, apparently + // TODO: try using the parent of m_mainShell. + // 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 { - /* - Boolean iconic; - XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL); +/* +Boolean iconic; +XtVaGetValues((Widget) m_mainWidget, XmNiconic, &iconic, NULL); - return iconic; - */ + return iconic; + */ 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, - XmNtitle, (char*) (const char*) title, - XmNdialogTitle, str, // Roberto Cocchi - XmNiconName, (char*) (const char*) title, - NULL); + XtVaSetValues((Widget) m_mainWidget, + XmNtitle, (char*) (const char*) title, + XmNdialogTitle, str, // Roberto Cocchi + XmNiconName, (char*) (const char*) title, + NULL); XmStringFree(str); } } 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); + return m_dialogTitle; } void wxDialog::Raise() { Window parent_window = XtWindow((Widget) m_mainWidget), - next_parent = XtWindow((Widget) m_mainWidget), - root = RootWindowOfScreen(XtScreen((Widget) m_mainWidget)); + next_parent = XtWindow((Widget) m_mainWidget), + root = RootWindowOfScreen(XtScreen((Widget) m_mainWidget)); // search for the parent that is child of ROOT, because the WM may // reparent twice and notify only the next parent (like FVWM) while (next_parent != root) { - Window *theChildren; unsigned int n; - parent_window = next_parent; - XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root, - &next_parent, &theChildren, &n); - XFree(theChildren); // not needed + Window *theChildren; unsigned int n; + parent_window = next_parent; + XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root, + &next_parent, &theChildren, &n); + XFree(theChildren); // not needed } XRaiseWindow(XtDisplay((Widget) m_mainWidget), parent_window); } @@ -420,16 +440,16 @@ void wxDialog::Raise() void wxDialog::Lower() { Window parent_window = XtWindow((Widget) m_mainWidget), - next_parent = XtWindow((Widget) m_mainWidget), - root = RootWindowOfScreen(XtScreen((Widget) m_mainWidget)); + next_parent = XtWindow((Widget) m_mainWidget), + root = RootWindowOfScreen(XtScreen((Widget) m_mainWidget)); // search for the parent that is child of ROOT, because the WM may // reparent twice and notify only the next parent (like FVWM) while (next_parent != root) { - Window *theChildren; unsigned int n; - parent_window = next_parent; - XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root, - &next_parent, &theChildren, &n); - XFree(theChildren); // not needed + Window *theChildren; unsigned int n; + parent_window = next_parent; + XQueryTree(XtDisplay((Widget) m_mainWidget), parent_window, &root, + &next_parent, &theChildren, &n); + XFree(theChildren); // not needed } XLowerWindow(XtDisplay((Widget) m_mainWidget), parent_window); } @@ -441,9 +461,9 @@ bool wxDialog::Show(bool show) if (show) { if (!wxUSE_INVISIBLE_RESIZE) - XtMapWidget(XtParent((Widget) m_mainWidget)); + XtMapWidget(XtParent((Widget) m_mainWidget)); else - XtManageChild((Widget) m_mainWidget) ; + XtManageChild((Widget) m_mainWidget) ; XRaiseWindow(XtDisplay((Widget) m_mainWidget), XtWindow((Widget) m_mainWidget)); @@ -455,8 +475,8 @@ bool wxDialog::Show(bool show) else XtUnmanageChild((Widget) m_mainWidget) ; - XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); - XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); + XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())); + XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); } return TRUE; @@ -473,7 +493,7 @@ int wxDialog::ShowModal() return 0; wxModalShowingStack.Insert((wxObject *)TRUE); - + m_modalShowing = TRUE; XtAddGrab((Widget) m_mainWidget, TRUE, FALSE); @@ -482,16 +502,30 @@ int wxDialog::ShowModal() // Loop until we signal that the dialog should be closed while ((wxModalShowingStack.Number() > 0) && ((int)(wxModalShowingStack.First()->Data()) != 0)) { -// XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll); + // 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; + delete node; // Now process all events in case they get sent to a destroyed dialog XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE); @@ -515,7 +549,8 @@ void wxDialog::EndModal(int retCode) SetReturnCode(retCode); - XtRemoveGrab((Widget) m_mainWidget); + // Strangely, we don't seem to need this now. + // XtRemoveGrab((Widget) m_mainWidget); Show(FALSE); @@ -523,29 +558,29 @@ void wxDialog::EndModal(int retCode) wxNode *node = wxModalShowingStack.First(); if (node) - node->SetData((wxObject *)FALSE); + node->SetData((wxObject *)FALSE); } // Standard buttons void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { - if ( Validate() && TransferDataFromWindow() ) - { + if ( Validate() && TransferDataFromWindow() ) + { if ( IsModal() ) EndModal(wxID_OK); else { - SetReturnCode(wxID_OK); - this->Show(FALSE); + SetReturnCode(wxID_OK); + this->Show(FALSE); } - } + } } void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) { - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again + if (Validate()) + TransferDataFromWindow(); + // TODO probably need to disable the Apply button until things change again } void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) @@ -555,161 +590,129 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) else { SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + this->Show(FALSE); } } -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); + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + cancelEvent.SetEventObject( this ); + 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) bool wxDialog::Destroy() { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; + if (!wxPendingDelete.Member(this)) + wxPendingDelete.Append(this); + return TRUE; } void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -} - -void wxDialog::Fit() -{ + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + Refresh(); } // Handle a close event from the window manager -static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data, - XmAnyCallbackStruct *WXUNUSED(cbs)) +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); + 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); + // 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 *) +void wxDialogBoxEventHandler(Widget wid, + XtPointer WXUNUSED(client_data), + XEvent* event, + Boolean* continueToDispatch) { - 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) -{ - wxDialog *dialog = (wxDialog *)wxWidgetHashTable->Get((long)wid); - if (dialog) - { - wxMouseEvent wxevent(wxEVT_NULL); - if (wxTranslateMouseEvent(wxevent, dialog, wid, event)) + wxDialog *dialog = (wxDialog *)wxGetWindowFromTable(wid); + if (dialog) { - wxevent.SetEventObject(dialog); - wxevent.SetId(dialog->GetId()); - dialog->GetEventHandler()->ProcessEvent(wxevent); - } - else - { - // An attempt to implement OnCharHook by calling OnCharHook first; - // if this returns TRUE, set continueToDispatch to False - // (don't continue processing). - // Otherwise set it to True and call OnChar. - wxKeyEvent keyEvent(wxEVENT_TYPE_CHAR); - if (wxTranslateKeyEvent(keyEvent, dialog, wid, event)) - { - keyEvent.SetEventObject(dialog); - keyEvent.SetId(dialog->GetId()); - keyEvent.SetEventType(wxEVT_CHAR_HOOK); - if (dialog->GetEventHandler()->ProcessEvent(keyEvent)) + wxMouseEvent wxevent(wxEVT_NULL); + if (wxTranslateMouseEvent(wxevent, dialog, wid, event)) { - *continueToDispatch = False; - return; + wxevent.SetEventObject(dialog); + wxevent.SetId(dialog->GetId()); + dialog->GetEventHandler()->ProcessEvent(wxevent); } else { - keyEvent.SetEventType(wxEVT_CHAR); - dialog->GetEventHandler()->ProcessEvent(keyEvent); - } - } + // An attempt to implement OnCharHook by calling OnCharHook first; + // if this returns TRUE, set continueToDispatch to False + // (don't continue processing). + // Otherwise set it to True and call OnChar. + wxKeyEvent keyEvent(wxEVT_CHAR); + if (wxTranslateKeyEvent(keyEvent, dialog, wid, event)) + { + keyEvent.SetEventObject(dialog); + keyEvent.SetId(dialog->GetId()); + keyEvent.SetEventType(wxEVT_CHAR_HOOK); + if (dialog->GetEventHandler()->ProcessEvent(keyEvent)) + { + *continueToDispatch = False; + return; + } + else + { + // 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); + } + } + } + } } - } - *continueToDispatch = True; + *continueToDispatch = True; } static void wxUnmapBulletinBoard(Widget WXUNUSED(dialog), wxDialog *WXUNUSED(client), XtPointer WXUNUSED(call) ) { - /* This gets called when the dialog is being shown, which - * defeats modal showing. - client->m_modalShowing = FALSE ; - client->m_isShown = FALSE; - */ +/* This gets called when the dialog is being shown, which +* defeats modal showing. +client->m_modalShowing = FALSE ; +client->m_isShown = FALSE; + */ } void wxDialog::ChangeFont(bool keepOriginalSize)