DP: native wxTreeCtrl for GTK.

[wxWidgets.git] / include / wx / msw / mdi.h

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index d5039e704e0ff0910df4c3ad1dddfb54decb07f4..658aa6c63d528da49c734879935b8fa15a012df7 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MDIH__
-#define __MDIH__
+#ifndef _WX_MDI_H_
+#define _WX_MDI_H_
 
 #ifdef __GNUG__
 #pragma interface "mdi.h"
@@ -63,10 +63,6 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);
 
-  // Toolbar (currently, for use by Windows MDI parent frames ONLY)
-  virtual inline void SetToolBar(wxWindow *toolbar) { m_frameToolBar = toolbar; }
-  virtual inline wxWindow *GetToolBar(void) const { return m_frameToolBar; }
-
   void SetMenuBar(wxMenuBar *menu_bar);
 
   // Gets the size available for subwindows after menu size, toolbar size
@@ -98,6 +94,7 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame
   bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
   void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu);
   bool MSWProcessMessage(WXMSG *msg);
+  bool MSWTranslateMessage(WXMSG *msg);
   void MSWOnCreate(WXLPCREATESTRUCT cs);
   long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
   bool MSWOnEraseBkgnd(WXHDC pDC);
@@ -113,7 +110,6 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame
     WXHMENU                         m_windowMenu;
     bool                            m_parentFrameActive; // TRUE if MDI Frame is intercepting
                                                          // commands, not child
-    wxWindow *                      m_frameToolBar ;
 DECLARE_EVENT_TABLE()
 };
 
@@ -166,6 +162,7 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame
     bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
     long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
     bool MSWProcessMessage(WXMSG *msg);
+    bool MSWTranslateMessage(WXMSG *msg);
     void MSWDestroyWindow(void);
 
     // Implementation
@@ -209,4 +206,4 @@ DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __MDIH__
+    // _WX_MDI_H_