Don't suppress accelerators that include Enter just because a tree control is focused

[wxWidgets.git] / include / wx / dialog.h

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 58a30e2d0c1247fea384a2e0425cbc8dd9ae44de..271c0c32bef77506d6ea914880b21d651647fb15 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -13,11 +13,10 @@
 #define _WX_DIALOG_H_BASE_
 
 #include "wx/defs.h"
 #define _WX_DIALOG_H_BASE_
 
 #include "wx/defs.h"

-#include "wx/containr.h"

 #include "wx/toplevel.h"
 
 #include "wx/toplevel.h"
 

-class WXDLLEXPORT wxSizer;
-class WXDLLEXPORT wxStdDialogButtonSizer;
+class WXDLLIMPEXP_FWD_CORE wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;

 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 


@@ -27,7 +26,7 @@ class WXDLLEXPORT wxStdDialogButtonSizer;
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
 
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
 

-extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];

 
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 
 class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {


@@ -141,7 +140,6 @@ private:
 
     DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
 
     DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()

-    WX_DECLARE_CONTROL_CONTAINER();

 };
 
 
 };