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 bf9d71646acc39c2b7af35587705d86aa119d39e..95e6b6f99eafbca8b6410b306c8a445290910827 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.99

-// RCS-ID:      $Id$

 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,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;


@@ -65,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


@@ -242,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;


@@ -350,9 +346,7 @@ public:
 #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else
 #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else

-    #if defined(__WXPALMOS__)
-        #include "wx/palmos/dialog.h"
-    #elif defined(__WXMSW__)
+    #if defined(__WXMSW__)

         #include "wx/msw/dialog.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dialog.h"
         #include "wx/msw/dialog.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dialog.h"