projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix a typo in comment
[wxWidgets.git]
/
src
/
motif
/
window.cpp
diff --git
a/src/motif/window.cpp
b/src/motif/window.cpp
index 95000fe071bf0820edd4c452e402f48e3ae6804c..116998f5a8dc43889162539bf8588f6b213a1697 100644
(file)
--- a/
src/motif/window.cpp
+++ b/
src/motif/window.cpp
@@
-20,12
+20,6
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/log.h"
@@
-351,11
+345,11
@@
bool wxWindow::Create(wxWindow *parent, wxWindowID id,
// Destructor
wxWindow::~wxWindow()
{
// Destructor
wxWindow::~wxWindow()
{
+ SendDestroyEvent();
+
if (g_captureWindow == this)
g_captureWindow = NULL;
if (g_captureWindow == this)
g_captureWindow = NULL;
- m_isBeingDeleted = true;
-
// Motif-specific actions first
WXWidget wMain = GetMainWidget();
if ( wMain )
// Motif-specific actions first
WXWidget wMain = GetMainWidget();
if ( wMain )
@@
-563,7
+557,7
@@
wxWindow *wxWindowBase::DoFindFocus()
// currently active.
// (2) The widget with the focus may not be in the widget table
// depending on which widgets I put in the table
// currently active.
// (2) The widget with the focus may not be in the widget table
// depending on which widgets I put in the table
- wxWindow *winFocus =
(wxWindow *)
NULL;
+ wxWindow *winFocus = NULL;
for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
node;
node = node->GetNext() )
@@
-1663,7
+1657,7
@@
void wxWindow::OnInternalIdle()
{
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
{
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
- if (wxUpdateUIEvent::CanUpdate(this) && IsShown())
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShown
OnScreen
())
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
@@
-1870,7
+1864,7
@@
WXDisplay *wxWindow::GetXDisplay() const
if ( wMain )
return (WXDisplay*) XtDisplay(wMain);
else
if ( wMain )
return (WXDisplay*) XtDisplay(wMain);
else
- return
(WXDisplay*)
NULL;
+ return NULL;
}
WXWidget wxWindow::GetMainWidget() const
}
WXWidget wxWindow::GetMainWidget() const