Misc small changes

[wxWidgets.git] / src / os2 / frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index becb832a40f1b9379ab63fbb75127905d981b560..f3c22d5db5d40bf5d8bd79aa50fdb6a9240a6fa2 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -125,12 +125,6 @@ bool wxFrame::Create(
 
     m_bIconized = FALSE;
 
 
     m_bIconized = FALSE;
 

-    //
-    // We pass NULL as parent to MSWCreate because frames with parents behave
-    // very strangely under Win95 shell.
-    // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
-    // with this ulStyle.
-    //

     if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
         pParent = NULL;
 
     if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
         pParent = NULL;
 


@@ -345,31 +339,60 @@ void wxFrame::DoGetPosition(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(

-  int                               nShowCmd
+  int                               bShowCmd

 )
 {
 )
 {

-    ::WinShowWindow(GetHwnd(), nShowCmd);
-    m_bIconized = nShowCmd == SWP_MINIMIZE;
+    HWND                            hClient;
+    HWND                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    HWND                            hMenuBar = NULLHANDLE;
+    SWP                             vSwp;
+    SWP                             vSwpTitlebar;
+    SWP                             vSwpVScroll;
+    SWP                             vSwpHScroll;
+    SWP                             vSwpMenu;
+
+    //
+    // Send anything to initialize the frame
+    //
+    WinQueryWindowPos(GetHwnd(), &vSwp);
+    hClient = WinWindowFromID(GetHwnd(), FID_CLIENT);
+    hTitlebar = WinWindowFromID(GetHwnd(), FID_TITLEBAR);
+    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
+    hHScroll = WinWindowFromID(GetHwnd(), FID_HORZSCROLL);
+    WinQueryWindowPos(hHScroll, &vSwpHScroll);
+    hVScroll = WinWindowFromID(GetHwnd(), FID_VERTSCROLL);
+    WinQueryWindowPos(hVScroll, &vSwpVScroll);
+    hMenuBar = WinWindowFromID(GetHwnd(), FID_MENU);
+    WinQueryWindowPos(hMenuBar, &vSwpMenu);
+    WinSetWindowPos( hClient
+                    ,HWND_TOP
+                    ,SV_CXSIZEBORDER
+                    ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy
+                    ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx)
+                    ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy)
+                    ,SWP_SIZE | SWP_MOVE
+                   );
+    ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
+    ::WinShowWindow(hClient, (BOOL)bShowCmd);

 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {
 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {

-    DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE);
+    SWP                             vSwp;
+
+    DoShowWindow((int)bShow);

 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 

-        ::WinSetWindowPos( (HWND) GetHWND()
-                          ,HWND_TOP
-                          ,0
-                          ,0
-                          ,0
-                          ,0
-                          ,SWP_ZORDER
-                         );
+        ::WinQueryWindowPos(GetHwnd(), &vSwp);
+        m_bIconized = vSwp.fl & SWP_MINIMIZE;
+        ::WinEnableWindow(GetHwnd(), TRUE);

         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
     }
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
     }


@@ -382,15 +405,18 @@ bool wxFrame::Show(
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 

+            ::WinQueryWindowPos(hWndParent, &vSwp);
+            m_bIconized = vSwp.fl & SWP_MINIMIZE;

             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP
             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP

-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,SWP_ZORDER
+                                  ,vSwp.x
+                                  ,vSwp.y
+                                  ,vSwp.cx
+                                  ,vSwp.cy
+                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE

                                  );
                                  );

+            ::WinEnableWindow(hWndParent, TRUE);

         }
     }
     return TRUE;
         }
     }
     return TRUE;


@@ -444,13 +470,18 @@ void wxFrame::SetIcon(
 {
     wxFrameBase::SetIcon(rIcon);
 
 {
     wxFrameBase::SetIcon(rIcon);
 

-    if (m_icon.Ok())
+    if ((m_icon.GetHICON()) != NULLHANDLE)

     {
     {

-        WinSendMsg( GetHwnd()
-                   ,WM_SETICON
-                   ,(MPARAM)((HICON)m_icon.GetHICON())
-                   ,NULL
-                  );
+        ::WinSendMsg( GetHwnd()
+                     ,WM_SETICON
+                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())
+                     ,NULL
+                    );
+        ::WinSendMsg( GetHwnd()
+                     ,WM_UPDATEFRAME
+                     ,(MPARAM)FCF_ICON
+                     ,(MPARAM)0
+                    );

     }
 } // end of wxFrame::SetIcon
 
     }
 } // end of wxFrame::SetIcon
 


@@ -521,6 +552,9 @@ void wxFrame::SetMenuBar(
   wxMenuBar*                        pMenuBar
 )
 {
   wxMenuBar*                        pMenuBar
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;
+

     if (!pMenuBar)
     {
         DetachMenuBar();
     if (!pMenuBar)
     {
         DetachMenuBar();


@@ -547,6 +581,22 @@ void wxFrame::SetMenuBar(
             return;
     }
 
             return;
     }
 

+    //
+    // Set the parent and owner of the menubar to be the frame
+    //
+    if (!::WinSetParent(m_hMenu, GetHwnd(), FALSE))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+
+    if (!::WinSetOwner(m_hMenu, GetHwnd()))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }

     InternalSetMenuBar();
 
     m_frameMenuBar = pMenuBar;
     InternalSetMenuBar();
 
     m_frameMenuBar = pMenuBar;


@@ -555,12 +605,7 @@ void wxFrame::SetMenuBar(
 
 void wxFrame::InternalSetMenuBar()
 {
 
 void wxFrame::InternalSetMenuBar()
 {

-
-    ::WinPostMsg( GetHwnd()
-                 ,WM_UPDATEFRAME
-                 ,(MPARAM)FCF_MENU
-                 ,NULL
-                );
+    WinSendMsg((HWND)GetHwnd(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

 } // end of wxFrame::InternalSetMenuBar
 
 //
 } // end of wxFrame::InternalSetMenuBar
 
 //


@@ -727,83 +772,196 @@ bool wxFrame::OS2Create(
 , long                              ulStyle
 )
 {
 , long                              ulStyle
 )
 {

-    ULONG                           ulPmFlags = 0L;
+    ULONG                           ulCreateFlags = 0L;
+    ULONG                           ulStyleFlags = 0L;

     ULONG                           ulExtraFlags = 0L;
     ULONG                           ulExtraFlags = 0L;

-    ULONG                           ulTempFlags = FCF_STANDARD;
+    FRAMECDATA                      vFrameCtlData;
+    HWND                            hParent = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;
+    HWND                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    HWND                            hMenuBar = NULLHANDLE;
+    HWND                            hMenu1 = NULLHANDLE;
+    HWND                            hMenu2 = NULLHANDLE;
+    HWND                            hFrame = NULLHANDLE;
+    SWP                             vSwp;
+    SWP                             vSwpTitlebar;
+    SWP                             vSwpVScroll;
+    SWP                             vSwpHScroll;
+    SWP                             vSwpMenu;
+    RGB2                            vRgb;

 
     m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
 
     m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);

+    memset(&vSwp, '\0', sizeof(SWP));
+    memset(&vSwpTitlebar, '\0', sizeof(SWP));
+    memset(&vSwpVScroll, '\0', sizeof(SWP));
+    memset(&vSwpHScroll, '\0', sizeof(SWP));
+
+    if (pParent)
+        hParent = GetWinHwnd(pParent);
+    else
+        hParent = HWND_DESKTOP;

 
     if (ulStyle == wxDEFAULT_FRAME_STYLE)
 
     if (ulStyle == wxDEFAULT_FRAME_STYLE)

-        ulPmFlags = FCF_STANDARD;
+        ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
+                        FCF_MINMAX | FCF_VERTSCROLL | FCF_HORZSCROLL | FCF_TASKLIST;

     else
     {
         if ((ulStyle & wxCAPTION) == wxCAPTION)
     else
     {
         if ((ulStyle & wxCAPTION) == wxCAPTION)

-            ulPmFlags = FCF_TASKLIST;
+            ulCreateFlags = FCF_TASKLIST;

         else
         else

-            ulPmFlags = FCF_NOMOVEWITHOWNER;
+            ulCreateFlags = FCF_NOMOVEWITHOWNER;

 
         if (ulStyle & wxMINIMIZE_BOX)
 
         if (ulStyle & wxMINIMIZE_BOX)

-            ulPmFlags |= FCF_MINBUTTON;
+            ulCreateFlags |= FCF_MINBUTTON;

         if (ulStyle & wxMAXIMIZE_BOX)
         if (ulStyle & wxMAXIMIZE_BOX)

-            ulPmFlags |= FCF_MAXBUTTON;
+            ulCreateFlags |= FCF_MAXBUTTON;

         if (ulStyle & wxTHICK_FRAME)
         if (ulStyle & wxTHICK_FRAME)

-            ulPmFlags |= FCF_DLGBORDER;
+            ulCreateFlags |= FCF_DLGBORDER;

         if (ulStyle & wxSYSTEM_MENU)
         if (ulStyle & wxSYSTEM_MENU)

-            ulPmFlags |= FCF_SYSMENU;
-        if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
-            ulPmFlags |= WS_MINIMIZED;
-        if (ulStyle & wxMAXIMIZE)
-            ulPmFlags |= WS_MAXIMIZED;
+            ulCreateFlags |= FCF_SYSMENU;

         if (ulStyle & wxCAPTION)
         if (ulStyle & wxCAPTION)

-            ulPmFlags |= FCF_TASKLIST;
+            ulCreateFlags |= FCF_TASKLIST;

         if (ulStyle & wxCLIP_CHILDREN)
         {
             // Invalid for frame windows under PM
         }
 
         if (ulStyle & wxCLIP_CHILDREN)
         {
             // Invalid for frame windows under PM
         }
 

-        //
-        // Keep this in wxFrame because it saves recoding this function
-        // in wxTinyFrame
-        //
-#if wxUSE_ITSY_BITSY
-        if (ulStyle & wxTINY_CAPTION_VERT)
-            ulExtraFlags |= kVertCaption;
-        if (ulStyle & wxTINY_CAPTION_HORIZ)
-            ulExtraFlags |= kHorzCaption;
-#else

         if (ulStyle & wxTINY_CAPTION_VERT)
         if (ulStyle & wxTINY_CAPTION_VERT)

-            ulPmFlags |= FCF_TASKLIST;
+            ulCreateFlags |= FCF_TASKLIST;

         if (ulStyle & wxTINY_CAPTION_HORIZ)
         if (ulStyle & wxTINY_CAPTION_HORIZ)

-            ulPmFlags |= FCF_TASKLIST;
-#endif
+            ulCreateFlags |= FCF_TASKLIST;
+

         if ((ulStyle & wxTHICK_FRAME) == 0)
         if ((ulStyle & wxTHICK_FRAME) == 0)

-            ulPmFlags |= FCF_BORDER;
+            ulCreateFlags |= FCF_BORDER;

         if (ulStyle & wxFRAME_TOOL_WINDOW)
             ulExtraFlags = kFrameToolWindow;
 
         if (ulStyle & wxSTAY_ON_TOP)
         if (ulStyle & wxFRAME_TOOL_WINDOW)
             ulExtraFlags = kFrameToolWindow;
 
         if (ulStyle & wxSTAY_ON_TOP)

-            ulPmFlags |= FCF_SYSMODAL;
+            ulCreateFlags |= FCF_SYSMODAL;

     }
     }

+    if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
+        ulStyleFlags |= WS_MINIMIZED;
+    if (ulStyle & wxMAXIMIZE)
+        ulStyleFlags |= WS_MAXIMIZED;
+

     //
     // Clear the visible flag, we always call show
     //
     //
     // Clear the visible flag, we always call show
     //

-    ulPmFlags &= (unsigned long)~WS_VISIBLE;
+    ulStyleFlags &= (unsigned long)~WS_VISIBLE;

     m_bIconized = FALSE;
     m_bIconized = FALSE;

-    if ( !wxWindow::OS2Create( nId
-                              ,pParent
-                              ,zWclass
-                              ,pWxWin
-                              ,zTitle
-                              ,nX
-                              ,nY
-                              ,nWidth
-                              ,nHeight
-                              ,ulPmFlags
-                              ,NULL
-                              ,ulExtraFlags))
+
+    //
+    // Set the frame control block
+    //
+    vFrameCtlData.cb            = sizeof(vFrameCtlData);
+    vFrameCtlData.flCreateFlags = ulCreateFlags;
+    vFrameCtlData.hmodResources = 0L;
+    vFrameCtlData.idResources   = 0;
+
+    //
+    // Create the frame window
+    //
+    if (!wxWindow::OS2Create( hParent
+                             ,WC_FRAME
+                             ,zTitle
+                             ,ulStyleFlags
+                             ,(long)nX
+                             ,(long)nY
+                             ,(long)nWidth
+                             ,(long)nHeight
+                             ,NULLHANDLE
+                             ,HWND_TOP
+                             ,(long)nId
+                             ,(void*)&vFrameCtlData
+                             ,NULL
+                            ))
+    {
+        return FALSE;
+    }
+
+    //
+    // Create the client window.  We must call the API from here rather than
+    // the static base class create because we need a separate handle
+    //
+    if ((hClient = ::WinCreateWindow( hFrame   // Frame is parent
+                                     ,wxFrameClassName
+                                     ,NULL        // Window title
+                                     ,0           // No styles
+                                     ,0, 0, 0, 0  // Window position
+                                     ,NULLHANDLE  // Owner
+                                     ,HWND_TOP    // Sibling
+                                     ,FID_CLIENT  // standard client ID
+                                     ,NULL        // Creation data
+                                     ,NULL        // Window Pres Params
+                                     )) == 0L)

     {
         return FALSE;
     }
     {
         return FALSE;
     }

+    //
+    // Send anything to initialize the frame
+    //
+    ::WinSendMsg( hFrame
+                 ,WM_UPDATEFRAME
+                 ,(MPARAM)FCF_TASKLIST
+                 ,(MPARAM)0
+                );
+
+    //
+    // Now size everything.  If adding a menu the client will need to be resized.
+    //
+    if (!::WinSetWindowPos( hFrame
+                           ,HWND_TOP
+                           ,nX
+                           ,nY
+                           ,nWidth
+                           ,nHeight
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
+                          ))
+        return FALSE;
+
+    WinQueryWindowPos(hFrame, &vSwp);
+
+    //
+    // Set the client window's background, otherwise it is transparent!
+    //
+    wxColour                        vColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+
+    vRgb.bRed   = (BYTE)vColour.Red();
+    vRgb.bGreen = (BYTE)vColour.Green();
+    vRgb.bBlue  = (BYTE)vColour.Blue();
+    WinSetPresParam( hClient
+                    ,PP_BACKGROUNDCOLOR
+                    ,(ULONG)sizeof(RGB2)
+                    ,(PVOID)&vRgb
+                   );
+    if (ulCreateFlags & FCF_TITLEBAR)
+    {
+        hTitlebar = WinWindowFromID(hFrame, FID_TITLEBAR);
+        WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
+    }
+    if (ulCreateFlags & FCF_HORZSCROLL)
+    {
+        hHScroll = WinWindowFromID(hFrame, FID_HORZSCROLL);
+        WinQueryWindowPos(hHScroll, &vSwpHScroll);
+    }
+    if (ulCreateFlags & FCF_VERTSCROLL)
+    {
+        hVScroll = WinWindowFromID(hFrame, FID_VERTSCROLL);
+        WinQueryWindowPos(hVScroll, &vSwpVScroll);
+    }
+    if (!::WinSetWindowPos( hClient
+                           ,HWND_TOP
+                           ,SV_CXSIZEBORDER
+                           ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy
+                           ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx)
+                           ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpHScroll.cy)
+                           ,SWP_SIZE | SWP_MOVE
+                          ))
+        return FALSE;
+    WinQueryWindowPos(hClient, &vSwp);
+    ::WinShowWindow(hClient, TRUE);

     return TRUE;
 } // end of wxFrame::OS2Create
 
     return TRUE;
 } // end of wxFrame::OS2Create