Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 9289aa2d583fa882b8624d34fbd8e3210d2de9f5..4c52be1cee32e0e0174b8b31488772bccd0733bb 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -43,7 +43,7 @@
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/textwrapper.h"
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/textwrapper.h"

-#include "wx/testing.h"
+#include "wx/modalhook.h"

 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"


@@ -51,8 +51,6 @@
 
 extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
 
 
 extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
 

-wxModalDialogHook *wxModalDialogHook::ms_instance = NULL;
-

 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------


@@ -425,7 +423,7 @@ bool wxDialogBase::EmulateButtonClickIfPresent(int id)
     if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
         return false;
 
     if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
         return false;
 

-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
+    wxCommandEvent event(wxEVT_BUTTON, id);

     event.SetEventObject(btn);
     btn->GetEventHandler()->ProcessEvent(event);
 
     event.SetEventObject(btn);
     btn->GetEventHandler()->ProcessEvent(event);