Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 10a3a0d67d2c07348b9c6395afdf006ebc733c28..95e6b6f99eafbca8b6410b306c8a445290910827 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -11,8 +11,8 @@
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 
 #ifndef _WX_DIALOG_H_BASE_
 #define _WX_DIALOG_H_BASE_
 

-#include "wx/defs.h"

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

+#include "wx/containr.h"

 
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
 
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;


@@ -64,10 +64,10 @@ enum wxDialogModality
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 

-class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
+class WXDLLIMPEXP_CORE wxDialogBase : public wxNavigationEnabled<wxTopLevelWindow>

 {
 public:
 {
 public:

-    wxDialogBase() { Init(); }
+    wxDialogBase();

     virtual ~wxDialogBase() { }
 
     // define public wxDialog methods to be implemented by the derived classes
     virtual ~wxDialogBase() { }
 
     // define public wxDialog methods to be implemented by the derived classes


@@ -241,9 +241,6 @@ protected:
     static bool                         sm_layoutAdaptation;
 
 private:
     static bool                         sm_layoutAdaptation;
 
 private:

-    // common part of all ctors
-    void Init();
-

     // helper of GetParentForModalDialog(): returns the passed in window if it
     // can be used as our parent or NULL if it can't
     wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;
     // helper of GetParentForModalDialog(): returns the passed in window if it
     // can be used as our parent or NULL if it can't
     wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;