[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / motif / dialog.cpp

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index def4c93d14be26d1b92caf0857ef79f4fd9e686c..84ca36e6db39082941c35c982da5a26393918e9b 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dialog.h"
 #endif
 
 #pragma implementation "dialog.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtWindow XTWINDOW
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtWindow XTWINDOW


@@ -81,7 +84,7 @@ END_EVENT_TABLE()
 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop = NULL;
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }
     m_eventLoop = NULL;
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
 }


@@ -97,9 +100,9 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )
 
     if( !wxTopLevelWindow::Create( parent, id, title, pos, size, style,
                                    name ) )

-        return FALSE;
+        return false;

 
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop = NULL;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     m_eventLoop = NULL;
 
     m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);


@@ -111,7 +114,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     SetTitle( title );
 
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     SetTitle( title );
 
     m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

-    ChangeFont(FALSE);
+    ChangeFont(false);

 
     // Can't remember what this was about... but I think it's necessary.
     if (wxUSE_INVISIBLE_RESIZE)
 
     // Can't remember what this was about... but I think it's necessary.
     if (wxUSE_INVISIBLE_RESIZE)


@@ -133,19 +136,19 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     // is managed, so we manage without mapping to the screen.
     // To show, we map the shell (actually it's parent).
     if (!wxUSE_INVISIBLE_RESIZE)
     // 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);
+        XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);

 
     if (!wxUSE_INVISIBLE_RESIZE)
     {
         XtManageChild(dialogShell);
         SetSize(pos.x, pos.y, size.x, size.y);
     }
 
     if (!wxUSE_INVISIBLE_RESIZE)
     {
         XtManageChild(dialogShell);
         SetSize(pos.x, pos.y, size.x, size.y);
     }

-    XtAddEventHandler(dialogShell,ExposureMask,FALSE,
+    XtAddEventHandler(dialogShell,ExposureMask,False,

         wxUniversalRepaintProc, (XtPointer) this);
 
     ChangeBackgroundColour();
 
         wxUniversalRepaintProc, (XtPointer) this);
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
 }
 
 bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,


@@ -189,12 +192,15 @@ bool wxDialog::DoCreate( wxWindow* parent, wxWindowID id,
 
     wxAddWindowToTable( (Widget)m_mainWidget, this );
 
 
     wxAddWindowToTable( (Widget)m_mainWidget, this );
 

-    return TRUE;
+    return true;

 }
 
 void wxDialog::SetModal(bool flag)
 {
 }
 
 void wxDialog::SetModal(bool flag)
 {

-    if ( flag )
+#ifdef __VMS
+#pragma message disable codcauunr
+#endif
+   if ( flag )

         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )
         m_windowStyle |= wxDIALOG_MODAL ;
     else
         if ( m_windowStyle & wxDIALOG_MODAL )


@@ -203,24 +209,31 @@ void wxDialog::SetModal(bool flag)
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);
         wxModelessWindows.DeleteObject(this);
         if (!flag)
             wxModelessWindows.Append(this);

+#ifdef __VMS
+#pragma message enable codcauunr
+#endif

 }
 
 wxDialog::~wxDialog()
 {
 }
 
 wxDialog::~wxDialog()
 {

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
+

     delete m_eventLoop;
 
     if (m_mainWidget)
     {
     delete m_eventLoop;
 
     if (m_mainWidget)
     {

-        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, FALSE,
+        XtRemoveEventHandler((Widget) m_mainWidget, ExposureMask, False,

                              wxUniversalRepaintProc, (XtPointer) this);
     }
 
                              wxUniversalRepaintProc, (XtPointer) this);
     }
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

+
+    PreDestroy();
+    DoDestroy();

 }
 
 void wxDialog::DoDestroy()
 }
 
 void wxDialog::DoDestroy()


@@ -278,8 +291,8 @@ void wxDialog::SetTitle(const wxString& title)
 
 bool wxDialog::Show( bool show )
 {
 
 bool wxDialog::Show( bool show )
 {

-    if( !wxTopLevelWindowMotif::Show( show ) )
-        return FALSE;
+    if( !wxWindowBase::Show( show ) )
+        return false;

 
     m_isShown = show;
 
 
     m_isShown = show;
 


@@ -301,11 +314,11 @@ bool wxDialog::Show( bool show )
         else
             XtUnmanageChild((Widget)m_mainWidget) ;
 
         else
             XtUnmanageChild((Widget)m_mainWidget) ;
 

-        XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
-        XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
+        XFlush(XtDisplay((Widget)m_mainWidget));
+        XSync(XtDisplay((Widget)m_mainWidget), False);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // Shows a dialog modally, returning a return code
 }
 
 // Shows a dialog modally, returning a return code


@@ -313,24 +326,22 @@ int wxDialog::ShowModal()
 {
     m_windowStyle |= wxDIALOG_MODAL;
 
 {
     m_windowStyle |= wxDIALOG_MODAL;
 

-    Show(TRUE);
+    Show(true);
+
+    // after the event loop ran, the widget might already have been destroyed
+    WXDisplay* display = (WXDisplay*)XtDisplay( (Widget)m_mainWidget );

 
     if (m_modalShowing)
         return 0;
     m_eventLoop = new wxEventLoop;
 
 
     if (m_modalShowing)
         return 0;
     m_eventLoop = new wxEventLoop;
 

-    m_modalShowing = TRUE;
-    XtAddGrab((Widget) m_mainWidget, TRUE, FALSE);
+    m_modalShowing = true;
+    XtAddGrab((Widget) m_mainWidget, True, False);

 
     m_eventLoop->Run();
 
     // Now process all events in case they get sent to a destroyed dialog
 
     m_eventLoop->Run();
 
     // Now process all events in case they get sent to a destroyed dialog

-    XSync(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), FALSE);
-    while (m_eventLoop->Pending())
-    {
-        XFlush(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()));
-        m_eventLoop->Dispatch();
-    }
+    wxFlushEvents( display );

 
     delete m_eventLoop;
     m_eventLoop = NULL;
 
     delete m_eventLoop;
     m_eventLoop = NULL;


@@ -350,9 +361,9 @@ void wxDialog::EndModal(int retCode)
     // Strangely, we don't seem to need this now.
     //    XtRemoveGrab((Widget) m_mainWidget);
 
     // Strangely, we don't seem to need this now.
     //    XtRemoveGrab((Widget) m_mainWidget);
 

-    Show(FALSE);
+    Show(false);

 
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

     m_eventLoop->Exit();
 }
 
     m_eventLoop->Exit();
 }
 


@@ -366,7 +377,7 @@ void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

-            this->Show(FALSE);
+            this->Show(false);

         }
     }
 }
         }
     }
 }


@@ -385,7 +396,7 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-        this->Show(FALSE);
+        this->Show(false);

     }
 }
 
     }
 }
 


@@ -424,7 +435,7 @@ bool wxDialog::Destroy()
 {
     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);
 {
     if (!wxPendingDelete.Member(this))
         wxPendingDelete.Append(this);

-    return TRUE;
+    return true;

 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 }
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))


@@ -441,11 +452,11 @@ void wxDialog::ChangeFont(bool keepOriginalSize)
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())
 void wxDialog::ChangeBackgroundColour()
 {
     if (GetMainWidget())

-        DoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);
+        wxDoChangeBackgroundColour(GetMainWidget(), m_backgroundColour);

 }
 
 void wxDialog::ChangeForegroundColour()
 {
     if (GetMainWidget())
 }
 
 void wxDialog::ChangeForegroundColour()
 {
     if (GetMainWidget())

-        DoChangeForegroundColour(GetMainWidget(), m_foregroundColour);
+        wxDoChangeForegroundColour(GetMainWidget(), m_foregroundColour);

 }
 }