wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually...

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

diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index ba390372c156588ba68b3344e56985e14865e75c..a7d61b0cc3b9aac71a373554520420a22b8338b5 100644 (file)
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -16,9 +16,6 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr;
-

 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIClientWindow;
 class WXDLLEXPORT wxMDIChildFrame;
 


@@ -64,7 +61,8 @@ public:
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient(void);
 
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient(void);
 

-    WXHMENU GetWindowMenu() const { return m_windowMenu; }
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
+//    void    SetWindowMenu(wxMwnu* pMenu);

 
     // MDI operations
     // --------------
 
     // MDI operations
     // --------------


@@ -86,9 +84,9 @@ public:
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing

-    virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 

-    virtual MRESULT OS2DefWindowProc(HWND hwnd, WXUINT, WXWPARAM, WXLPARAM);
+    virtual MRESULT OS2DefWindowProc(WXUINT, WXWPARAM, WXLPARAM);

     virtual bool OS2TranslateMessage(WXMSG* msg);
 
 protected:
     virtual bool OS2TranslateMessage(WXMSG* msg);
 
 protected:


@@ -96,7 +94,7 @@ protected:
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;

-    WXHMENU                         m_windowMenu;
+    wxMenu*                         m_windowMenu;

 
     // TRUE if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;
 
     // TRUE if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;


@@ -144,8 +142,8 @@ public:
     bool HandleWindowPosChanging(void *lpPos);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     bool HandleWindowPosChanging(void *lpPos);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 

-    virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual MRESULT OS2DefWindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual MRESULT OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool OS2TranslateMessage(WXMSG *msg);
 
     virtual void OS2DestroyWindow();
     virtual bool OS2TranslateMessage(WXMSG *msg);
 
     virtual void OS2DestroyWindow();