Don't generate any events from wxSpinCtrl and wxSpinCtrlDouble methods.

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index dc2719db4bc6bbff746210668b01935abb1eb35c..9ec0842c64739c7182db690dfdc49a93db41825a 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/12/98
 // Author:      Robert Roebling
 // Modified by:
 // Created:     12/12/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -19,7 +18,7 @@
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested
 #if wxUSE_FILEDLG
 
 // NOTE : it probably also supports MAC, untested

-#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__) && !defined(__PALMOS__)
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)

 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 
 #error wxGenericFileDialog currently only supports Unix, win32 and DOS
 #endif
 


@@ -49,6 +48,7 @@
 #include "wx/filectrl.h"
 #include "wx/generic/filedlgg.h"
 #include "wx/debug.h"
 #include "wx/filectrl.h"
 #include "wx/generic/filedlgg.h"
 #include "wx/debug.h"

+#include "wx/modalhook.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -57,7 +57,6 @@
     #include "wx/config.h"
 #endif
 
     #include "wx/config.h"
 #endif
 

-#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
     #include <sys/types.h>
     #include <sys/stat.h>
 #ifndef __WXWINCE__
     #include <sys/types.h>
     #include <sys/stat.h>


@@ -86,7 +85,6 @@
 #if defined(__UNIX__) || defined(__DOS__)
 #include <unistd.h>
 #endif
 #if defined(__UNIX__) || defined(__DOS__)
 #include <unistd.h>
 #endif

-#endif // ! __WXPALMOS5__

 
 #if defined(__WXWINCE__)
 #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))
 
 #if defined(__WXWINCE__)
 #define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))


@@ -164,7 +162,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
 {
     m_bypassGenericImpl = bypassGenericImpl;
 
 {
     m_bypassGenericImpl = bypassGenericImpl;
 

-    parent = GetParentForModalDialog(parent);
+    parent = GetParentForModalDialog(parent, style);

 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
                                   wildCard, style, pos, sz, name))
 
     if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
                                   wildCard, style, pos, sz, name))


@@ -310,6 +308,8 @@ wxBitmapButton* wxGenericFileDialog::AddBitmapButton( wxWindowID winId,
 
 int wxGenericFileDialog::ShowModal()
 {
 
 int wxGenericFileDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     if (CreateExtraControl())
     {
         wxSizer *sizer = GetSizer();
     if (CreateExtraControl())
     {
         wxSizer *sizer = GetSizer();