Applied #9011: Native wxListCtrl::HitTest on OS X

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

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index a7e4fc8aa6515e64290801464923d89522958bc3..347e11354cfeb7aacdfadb6d45fd2e24f0b86ae8 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/motif/dialog.cpp

 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      Julian Smart
 // Modified by:


@@ -9,24 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-

 // 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 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
 
 #endif
 

-#include "wx/dialog.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/settings.h"

 #include "wx/evtloop.h"
 
 #ifdef __VMS__
 #include "wx/evtloop.h"
 
 #ifdef __VMS__


@@ -66,27 +59,15 @@
 // for modal dialogs
 wxList wxModalDialogs;
 extern wxList wxModelessWindows;  // Frames and modeless dialogs
 // 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)
 
 
 #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;
 wxDialog::wxDialog()
 {
     m_modalShowing = false;
     m_eventLoop = NULL;

-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

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


@@ -105,58 +86,52 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     m_modalShowing = false;
     m_eventLoop = NULL;
 
     m_modalShowing = false;
     m_eventLoop = NULL;
 

-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    m_foregroundColour = *wxBLACK;
-

     Widget dialogShell = (Widget) m_mainWidget;
     Widget dialogShell = (Widget) m_mainWidget;

-    Widget shell = XtParent(dialogShell) ;

 
     SetTitle( title );
 
 
     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.
     // 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 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);
+#endif

 
     // 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).
 
     // 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
+    Widget shell = XtParent(dialogShell) ;
+    XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);
+#endif
+
+#if !wxUSE_INVISIBLE_RESIZE
+    XtManageChild(dialogShell);
+    SetSize(pos.x, pos.y, size.x, size.y);
+#endif

 
 

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

     XtAddEventHandler(dialogShell,ExposureMask,False,
         wxUniversalRepaintProc, (XtPointer) this);
 
     XtAddEventHandler(dialogShell,ExposureMask,False,
         wxUniversalRepaintProc, (XtPointer) this);
 

-    ChangeBackgroundColour();
+    PostCreation();

 
     return true;
 }
 
 bool wxDialog::XmDoCreateTLW(wxWindow* parent,
 
     return true;
 }
 
 bool wxDialog::XmDoCreateTLW(wxWindow* parent,

-                             wxWindowID id,
-                             const wxString& title,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
+                             wxWindowID WXUNUSED(id),
+                             const wxString& WXUNUSED(title),
+                             const wxPoint& WXUNUSED(pos),
+                             const wxSize& WXUNUSED(size),
+                             long WXUNUSED(style),

                              const wxString& name)
 {
     Widget parentWidget = (Widget) 0;
                              const wxString& name)
 {
     Widget parentWidget = (Widget) 0;


@@ -173,7 +148,7 @@ bool wxDialog::XmDoCreateTLW(wxWindow* parent,
     XtSetArg (args[1], XmNautoUnmanage, False);
     Widget dialogShell =
         XmCreateBulletinBoardDialog( parentWidget,
     XtSetArg (args[1], XmNautoUnmanage, False);
     Widget dialogShell =
         XmCreateBulletinBoardDialog( parentWidget,

-                                     wxConstCast(name.c_str(), char),
+                                     name.char_str(),

                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 
                                      args, 2);
     m_mainWidget = (WXWidget) dialogShell;
 


@@ -198,26 +173,18 @@ 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);
-        if (!flag)
-            wxModelessWindows.Append(this);
-#ifdef __VMS
-#pragma message enable codcauunr
-#endif
+       wxModelessWindows.DeleteObject(this);
+   else
+       wxModelessWindows.Append(this);

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

-    m_isBeingDeleted = true;
+    SendDestroyEvent();
+
+    // if the dialog is modal, this will end its event loop
+    Show(false);

 
     delete m_eventLoop;
 
 
     delete m_eventLoop;
 


@@ -228,10 +195,13 @@ wxDialog::~wxDialog()
     }
 
     m_modalShowing = false;
     }
 
     m_modalShowing = false;

-    if (!wxUSE_INVISIBLE_RESIZE && m_mainWidget)
+
+#if !wxUSE_INVISIBLE_RESIZE
+    if (m_mainWidget)

     {
         XtUnmapWidget((Widget) m_mainWidget);
     }
     {
         XtUnmapWidget((Widget) m_mainWidget);
     }

+#endif

 
     PreDestroy();
 
 
     PreDestroy();
 


@@ -242,23 +212,6 @@ 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();
-}
-

 void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
 void wxDialog::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     XtVaSetValues((Widget) m_mainWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);


@@ -279,9 +232,9 @@ void wxDialog::SetTitle(const wxString& title)
     {
         wxXmString str( title );
         XtVaSetValues( (Widget)m_mainWidget,
     {
         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 );
     }
 }
                        NULL );
     }
 }


@@ -291,25 +244,41 @@ bool wxDialog::Show( bool show )
     if( !wxWindowBase::Show( show ) )
         return false;
 
     if( !wxWindowBase::Show( show ) )
         return false;
 

+    if ( !show && IsModal() )
+        EndModal(wxID_CANCEL);
+

     m_isShown = show;
 
     if (show)
     {
     m_isShown = show;
 
     if (show)
     {

-        if (!wxUSE_INVISIBLE_RESIZE)
-            XtMapWidget(XtParent((Widget) m_mainWidget));
-        else
-            XtManageChild((Widget)m_mainWidget) ;
+        if (CanDoLayoutAdaptation())
+            DoLayoutAdaptation();

 
 

-        XRaiseWindow( XtDisplay( (Widget)m_mainWidget ), 
+        // 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
+        InitDialog();
+    }
+
+    if (show)
+    {
+#if !wxUSE_INVISIBLE_RESIZE
+        XtMapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtManageChild((Widget)m_mainWidget) ;
+#endif
+
+        XRaiseWindow( XtDisplay( (Widget)m_mainWidget ),

                       XtWindow( (Widget)m_mainWidget) );
 
     }
     else
     {
                       XtWindow( (Widget)m_mainWidget) );
 
     }
     else
     {

-        if (!wxUSE_INVISIBLE_RESIZE)
-            XtUnmapWidget(XtParent((Widget) m_mainWidget));
-        else
-            XtUnmanageChild((Widget)m_mainWidget) ;
+#if !wxUSE_INVISIBLE_RESIZE
+        XtUnmapWidget(XtParent((Widget) m_mainWidget));
+#else
+        XtUnmanageChild((Widget)m_mainWidget) ;
+#endif

 
         XFlush(XtDisplay((Widget)m_mainWidget));
         XSync(XtDisplay((Widget)m_mainWidget), False);
 
         XFlush(XtDisplay((Widget)m_mainWidget));
         XSync(XtDisplay((Widget)m_mainWidget), False);


@@ -321,8 +290,6 @@ bool wxDialog::Show( bool show )
 // Shows a dialog modally, returning a return code
 int wxDialog::ShowModal()
 {
 // Shows a dialog modally, returning a return code
 int wxDialog::ShowModal()
 {

-    m_windowStyle |= wxDIALOG_MODAL;
-

     Show(true);
 
     // after the event loop ran, the widget might already have been destroyed
     Show(true);
 
     // after the event loop ran, the widget might already have been destroyed


@@ -362,69 +329,8 @@ void wxDialog::EndModal(int retCode)
 
     m_modalShowing = false;
     m_eventLoop->Exit();
 
     m_modalShowing = false;
     m_eventLoop->Exit();

-}
-
-// 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);
+    SetModal(false);

 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)


@@ -435,12 +341,6 @@ bool wxDialog::Destroy()
     return true;
 }
 
     return true;
 }
 

-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-}
-

 void wxDialog::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);
 void wxDialog::ChangeFont(bool keepOriginalSize)
 {
     wxWindow::ChangeFont(keepOriginalSize);