// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
+#include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/settings.h"
#endif
-#include "wx/dialog.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/settings.h"
#include "wx/evtloop.h"
+#include "wx/modalhook.h"
#ifdef __VMS__
#pragma message disable nosimpint
// for modal dialogs
wxList wxModalDialogs;
extern wxList wxModelessWindows; // Frames and modeless dialogs
-extern wxList wxPendingDelete;
#define wxUSE_INVISIBLE_RESIZE 1
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
-
-BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)
- 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()
-
-
wxDialog::wxDialog()
{
m_modalShowing = false;
m_eventLoop = NULL;
- m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
}
bool wxDialog::Create(wxWindow *parent, wxWindowID id,
m_modalShowing = false;
m_eventLoop = NULL;
- m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- m_foregroundColour = *wxBLACK;
-
Widget dialogShell = (Widget) m_mainWidget;
SetTitle( title );
- m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
- ChangeFont(false);
-
// Can't remember what this was about... but I think it's necessary.
#if wxUSE_INVISIBLE_RESIZE
if (pos.x > -1)
XtAddEventHandler(dialogShell,ExposureMask,False,
wxUniversalRepaintProc, (XtPointer) this);
- ChangeBackgroundColour();
+ PostCreation();
return true;
}
XtSetArg (args[1], XmNautoUnmanage, False);
Widget dialogShell =
XmCreateBulletinBoardDialog( parentWidget,
- wxConstCast(name.c_str(), char),
+ name.char_str(),
args, 2);
m_mainWidget = (WXWidget) dialogShell;
wxDialog::~wxDialog()
{
- m_isBeingDeleted = true;
+ SendDestroyEvent();
+
+ // if the dialog is modal, this will end its event loop
+ Show(false);
delete m_eventLoop;
}
}
-// 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();
-}
-
void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
{
wxXmString str( title );
XtVaSetValues( (Widget)m_mainWidget,
- XmNtitle, title.c_str(),
- XmNdialogTitle, str(), // Roberto Cocchi
- XmNiconName, title.c_str(),
+ XmNtitle, (const char*)title.mb_str(),
+ XmNdialogTitle, str(),
+ XmNiconName, (const char*)title.mb_str(),
NULL );
}
}
if( !wxWindowBase::Show( show ) )
return false;
+ if ( !show && IsModal() )
+ EndModal(wxID_CANCEL);
+
m_isShown = show;
if (show)
{
+ if (CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
// this usually will result in TransferDataToWindow() being called
// which will change the controls values so do it before showing as
// otherwise we could have some flicker
// Shows a dialog modally, returning a return code
int wxDialog::ShowModal()
{
+ WX_HOOK_MODAL_DIALOG();
+
Show(true);
// after the event loop ran, the widget might already have been destroyed
// Now process all events in case they get sent to a destroyed dialog
wxFlushEvents( display );
- delete m_eventLoop;
- m_eventLoop = NULL;
+ wxDELETE(m_eventLoop);
// 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.
SetModal(false);
}
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
- if ( Validate() && TransferDataFromWindow() )
- {
- if ( IsModal() )
- EndModal(wxID_OK);
- else
- {
- 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
-}
-
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
- if ( IsModal() )
- EndModal(wxID_CANCEL);
- else
- {
- SetReturnCode(wxID_CANCEL);
- this->Show(false);
- }
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
- // We'll send a Cancel message by default,
- // which may close the dialog.
- // 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;
-
- closing.Append(this);
-
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
-
- closing.DeleteObject(this);
-}
-
// Destroy the window (delayed, if a managed window)
bool wxDialog::Destroy()
{
return true;
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- Refresh();
-}
-
void wxDialog::ChangeFont(bool keepOriginalSize)
{
wxWindow::ChangeFont(keepOriginalSize);
projects / wxWidgets.git / blobdiff