DeleteFunction argument should be non-const since it

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index d5a9b749305b2991b181019d049aa3c48d17b3c1..ecac0fae545551781f121194f0d79517b463d967 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dialog.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,6 +29,7 @@
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
+    #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -146,7 +143,7 @@ private:
     wxModalEventLoop m_evtLoop;
 };
 
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
 
 // ============================================================================
 // implementation
@@ -387,7 +384,7 @@ bool wxDialog::EmulateButtonClickIfPresent(int id)
 {
     wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
 
-    if ( !btn || !btn->IsEnabled() )
+    if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
         return false;
 
     btn->MSWCommand(BN_CLICKED, 0 /* unused */);