more 'unreachable code' warnings which had been disabled instead of being fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,6 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
|
|||||||
m_foregroundColour = *wxBLACK;
|
m_foregroundColour = *wxBLACK;
|
||||||
|
|
||||||
Widget dialogShell = (Widget) m_mainWidget;
|
Widget dialogShell = (Widget) m_mainWidget;
|
||||||
Widget shell = XtParent(dialogShell) ;
|
|
||||||
|
|
||||||
SetTitle( title );
|
SetTitle( title );
|
||||||
|
|
||||||
@@ -131,6 +130,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
|
|||||||
// is managed, so we manage without mapping to the screen.
|
// is managed, so we manage without mapping to the screen.
|
||||||
// To show, we map the shell (actually it's parent).
|
// To show, we map the shell (actually it's parent).
|
||||||
#if !wxUSE_INVISIBLE_RESIZE
|
#if !wxUSE_INVISIBLE_RESIZE
|
||||||
|
Widget shell = XtParent(dialogShell) ;
|
||||||
XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
|
XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -194,21 +194,10 @@ bool wxDialog::XmDoCreateTLW(wxWindow* parent,
|
|||||||
|
|
||||||
void wxDialog::SetModal(bool flag)
|
void wxDialog::SetModal(bool flag)
|
||||||
{
|
{
|
||||||
#ifdef __VMS
|
|
||||||
#pragma message disable codcauunr
|
|
||||||
#endif
|
|
||||||
if ( flag )
|
if ( flag )
|
||||||
m_windowStyle |= wxDIALOG_MODAL ;
|
|
||||||
else
|
|
||||||
if ( m_windowStyle & wxDIALOG_MODAL )
|
|
||||||
m_windowStyle -= wxDIALOG_MODAL ;
|
|
||||||
|
|
||||||
wxModelessWindows.DeleteObject(this);
|
wxModelessWindows.DeleteObject(this);
|
||||||
if (!flag)
|
else
|
||||||
wxModelessWindows.Append(this);
|
wxModelessWindows.Append(this);
|
||||||
#ifdef __VMS
|
|
||||||
#pragma message enable codcauunr
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxDialog::~wxDialog()
|
wxDialog::~wxDialog()
|
||||||
|
@@ -65,14 +65,7 @@ static void wxTLWEventHandler( Widget wid,
|
|||||||
|
|
||||||
void wxTopLevelWindowMotif::PreDestroy()
|
void wxTopLevelWindowMotif::PreDestroy()
|
||||||
{
|
{
|
||||||
#ifdef __VMS
|
|
||||||
#pragma message disable codcauunr
|
|
||||||
#endif
|
|
||||||
if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL )
|
|
||||||
wxModelessWindows.DeleteObject(this);
|
wxModelessWindows.DeleteObject(this);
|
||||||
#ifdef __VMS
|
|
||||||
#pragma message enable codcauunr
|
|
||||||
#endif
|
|
||||||
|
|
||||||
m_icons.m_icons.Empty();
|
m_icons.m_icons.Empty();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user