changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index d5039e704e0ff0910df4c3ad1dddfb54decb07f4..35879cd3805aa08dfaec2c1c749b8b45605b2e90 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,16 +63,13 @@ 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
   // and status bar size have been subtracted. If you want to manage your own
   // toolbar(s), don't call SetToolBar.
   void GetClientSize(int *width, int *height) const;
+  wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
 
   // Get the active MDI child window (Windows only)
   wxMDIChildFrame *GetActiveChild(void) const ;
@@ -98,6 +95,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 +111,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()
 };
 
@@ -150,8 +147,12 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 
   // Set menu bar
   void SetMenuBar(wxMenuBar *menu_bar);
+
   void SetClientSize(int width, int height);
+  void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+
   void GetPosition(int *x, int *y) const ;
+  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
 
   // MDI operations
   virtual void Maximize(void);
@@ -166,6 +167,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 +211,4 @@ DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __MDIH__
+    // _WX_MDI_H_