Added some tentative wxMotif clipboard code; did some file formatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -44,9 +44,9 @@
|
||||
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);
|
||||
|
||||
@@ -67,12 +67,12 @@ extern wxList wxPendingDelete;
|
||||
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_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
|
||||
@@ -84,76 +84,76 @@ wxDialog::wxDialog()
|
||||
}
|
||||
|
||||
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_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) ;
|
||||
|
||||
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);
|
||||
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,85 +162,85 @@ 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("<Configure>: resize()"));
|
||||
ptr = XtParseTranslationTable("<Configure>: 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
|
||||
if (XmIsMotifWMRunning(shell))
|
||||
{
|
||||
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) ;
|
||||
}
|
||||
// This allows non-Motif window managers to support at least the
|
||||
// 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.
|
||||
// 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);
|
||||
|
||||
wxDialogBoxRepaintProc, (XtPointer) this);
|
||||
|
||||
XtAddEventHandler(dialogShell,
|
||||
ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
|
||||
FALSE,
|
||||
wxDialogBoxEventHandler,
|
||||
(XtPointer)this);
|
||||
|
||||
ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask,
|
||||
FALSE,
|
||||
wxDialogBoxEventHandler,
|
||||
(XtPointer)this);
|
||||
|
||||
ChangeBackgroundColour();
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -250,11 +250,11 @@ 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()
|
||||
@@ -262,30 +262,30 @@ wxDialog::~wxDialog()
|
||||
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);
|
||||
|
||||
if (wxTheApp->GetExitOnFrameDelete())
|
||||
{
|
||||
wxTheApp->ExitMainLoop();
|
||||
}
|
||||
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
|
||||
@@ -293,16 +293,16 @@ wxDialog::~wxDialog()
|
||||
// this might remain on the screen.
|
||||
Display* display;
|
||||
if (m_mainWidget)
|
||||
display = XtDisplay((Widget) m_mainWidget);
|
||||
display = XtDisplay((Widget) m_mainWidget);
|
||||
else
|
||||
display = (Display*) wxGetDisplay();
|
||||
|
||||
display = (Display*) wxGetDisplay();
|
||||
|
||||
XSync(display, FALSE);
|
||||
XEvent event;
|
||||
while (XtAppPending((XtAppContext) wxTheApp->GetAppContext())) {
|
||||
XFlush(display);
|
||||
XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
|
||||
XtDispatchEvent(&event);
|
||||
XFlush(display);
|
||||
XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
|
||||
XtDispatchEvent(&event);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -310,35 +310,35 @@ wxDialog::~wxDialog()
|
||||
// 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);
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -362,61 +362,61 @@ void wxDialog::SetTitle(const wxString& title)
|
||||
{
|
||||
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);
|
||||
XmNtitle, (char*) (const char*) title,
|
||||
XmNdialogTitle, str, // Roberto Cocchi
|
||||
XmNiconName, (char*) (const char*) title,
|
||||
NULL);
|
||||
XmStringFree(str);
|
||||
}
|
||||
}
|
||||
|
||||
wxString wxDialog::GetTitle() const
|
||||
{
|
||||
return m_dialogTitle;
|
||||
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);
|
||||
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),
|
||||
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);
|
||||
}
|
||||
@@ -424,16 +424,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,16 +441,16 @@ void wxDialog::Lower()
|
||||
bool wxDialog::Show(bool show)
|
||||
{
|
||||
m_isShown = 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));
|
||||
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -458,11 +458,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);
|
||||
|
||||
XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
|
||||
XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
|
||||
}
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -470,43 +470,43 @@ 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);
|
||||
|
||||
// XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
|
||||
|
||||
XtAppNextEvent((XtAppContext) wxTheApp->GetAppContext(), &event);
|
||||
wxTheApp->ProcessXEvent((WXEvent*) &event);
|
||||
}
|
||||
|
||||
|
||||
// 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);
|
||||
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,41 +516,41 @@ 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);
|
||||
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))
|
||||
@@ -560,30 +560,30 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
|
||||
else
|
||||
{
|
||||
SetReturnCode(wxID_CANCEL);
|
||||
this->Show(FALSE);
|
||||
this->Show(FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
bool wxDialog::OnClose()
|
||||
{
|
||||
// Behaviour changed in 2.0: we'll send a Cancel message by default,
|
||||
// Behaviour changed in 2.0: we'll send a Cancel message by default,
|
||||
// which may close the dialog.
|
||||
// Check for looping if the Cancel event handler calls Close()
|
||||
|
||||
|
||||
static wxList closing;
|
||||
|
||||
|
||||
if ( closing.Member(this) )
|
||||
return FALSE;
|
||||
|
||||
|
||||
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);
|
||||
|
||||
closing.DeleteObject(this);
|
||||
|
||||
return FALSE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxDialog::OnCloseWindow(wxCloseEvent& event)
|
||||
@@ -598,15 +598,15 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
|
||||
// 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();
|
||||
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
|
||||
Refresh();
|
||||
}
|
||||
|
||||
void wxDialog::Fit()
|
||||
@@ -615,106 +615,106 @@ void wxDialog::Fit()
|
||||
|
||||
// Handle a close event from the window manager
|
||||
static void wxCloseDialogCallback( Widget WXUNUSED(widget), XtPointer client_data,
|
||||
XmAnyCallbackStruct *WXUNUSED(cbs))
|
||||
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);
|
||||
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;
|
||||
}
|
||||
}
|
||||
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)
|
||||
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 *)wxWidgetHashTable->Get((long)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(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))
|
||||
{
|
||||
*continueToDispatch = False;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
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)
|
||||
|
||||
Reference in New Issue
Block a user