cleanup - reformatting; simplified OnPaint

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 1f57be36a8e09b5a33a804ac2e780799e5a4e760..ecac0fae545551781f121194f0d79517b463d967 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -147,7 +143,7 @@ private:
     wxModalEventLoop m_evtLoop;
 };
 
     wxModalEventLoop m_evtLoop;
 };
 

-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -388,7 +384,7 @@ bool wxDialog::EmulateButtonClickIfPresent(int id)
 {
     wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
 
 {
     wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
 

-    if ( !btn || !btn->IsEnabled() )
+    if ( !btn || !btn->IsEnabled() || !btn->IsShown() )

         return false;
 
     btn->MSWCommand(BN_CLICKED, 0 /* unused */);
         return false;
 
     btn->MSWCommand(BN_CLICKED, 0 /* unused */);