Update configuration for OpenVMS

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 6f7db58da565e5815c4fb4b849e5f49982bfda47..628b685543194fde65e5bfac729c5931669a3bf1 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "docmdi.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE
 #include "wx/defs.h"
 
 #if wxUSE_MDI_ARCHITECTURE


@@ -27,20 +23,17 @@
  * Use this instead of wxMDIParentFrame
  */
 
  * Use this instead of wxMDIParentFrame
  */
 

-class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
+class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame

 {
 public:
     wxDocMDIParentFrame();
     wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,
 {
 public:
     wxDocMDIParentFrame();
     wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
+        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr);

 
     bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition,

-        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
-
-    // Extend event processing to search the document manager's event table
-    virtual bool ProcessEvent(wxEvent& event);
+        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr);

 
     wxDocManager *GetDocumentManager(void) const { return m_docManager; }
 
 
     wxDocManager *GetDocumentManager(void) const { return m_docManager; }
 


@@ -50,6 +43,9 @@ public:
 
 protected:
     void Init();
 
 protected:
     void Init();

+
+    virtual bool TryValidator(wxEvent& event);
+

     wxDocManager *m_docManager;
 
 private:
     wxDocManager *m_docManager;
 
 private:


@@ -62,14 +58,14 @@ private:
  * Use this instead of wxMDIChildFrame
  */
 
  * Use this instead of wxMDIChildFrame
  */
 

-class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
+class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame

 {
 public:
     wxDocMDIChildFrame();
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 {
 public:
     wxDocMDIChildFrame();
     wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
         const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-        long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
-    ~wxDocMDIChildFrame();
+        long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr);
+    virtual ~wxDocMDIChildFrame();

 
     bool Create(wxDocument *doc,
                 wxView *view,
 
     bool Create(wxDocument *doc,
                 wxView *view,


@@ -81,9 +77,6 @@ public:
                 long type = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long type = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    // Extend event processing to search the view's event table
-    virtual bool ProcessEvent(wxEvent& event);
-

     void OnActivate(wxActivateEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnActivate(wxActivateEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 


@@ -95,6 +88,9 @@ public:
 
 protected:
     void Init();
 
 protected:
     void Init();

+
+    virtual bool TryValidator(wxEvent& event);
+

     wxDocument*       m_childDocument;
     wxView*           m_childView;
 
     wxDocument*       m_childDocument;
     wxView*           m_childView;