Oops, I left an extra { in there.

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index cd9b1d9b742bb0f267c30a504c770bc80c09b122..4754b66a6753093c9ae3586f44792ffe830d0d09 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 
 #ifndef _WX_DOCMDI_H_
 #define _WX_DOCMDI_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "docmdi.h"
 #endif
 
 #pragma interface "docmdi.h"
 #endif
 


@@ -59,11 +59,22 @@ private:
 class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
 {
 public:
 class WXDLLEXPORT 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,
         long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
     ~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();
 

+    bool Create(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 = wxFrameNameStr);
+

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


@@ -77,6 +88,7 @@ public:
     bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }
     
 protected:
     bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }
     
 protected:

+    void Init();

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