m_nFsToolBarHeight = 0;
m_bFsIsMaximized = FALSE;
m_bFsIsShowing = FALSE;
+ m_bIsShown = FALSE;
+ m_pWinLastFocused = (wxWindow *)NULL;
//
// Initialize SWP's
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
+
wxTopLevelWindows.DeleteObject(this);
DeleteAllBars();
if (wxTheApp->GetExitOnFrameDelete())
{
- ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0);
+ ::WinPostMsg(NULL, WM_QUIT, 0, 0);
}
}
+
wxModelessWindows.DeleteObject(this);
//
::WinQueryWindowRect(GetHwnd(), &vRect);
- ::WinQueryWindowRect(m_hFrame, &vRect2);
+ ::WinQueryWindowRect(GetHWND(), &vRect2);
//
// Find the difference between the entire window (title bar and all)
POINTL vPointl;
vPointl.x = vRect2.xLeft;
- vPoint.y = vRect2.yTop;
+ vPointl.y = vRect2.yTop;
- ::WinSetWindowPos( m_hFrame
+ ::WinSetWindowPos( hWnd
,HWND_TOP
,vPointl.x
,vPointl.y
{
RECTL vRect;
- ::WinQueryWindowRect(m_hFrame, &vRect);
+ ::WinQueryWindowRect(GetHWND(), &vRect);
*pWidth = vRect.xRight - vRect.xLeft;
*pHeight = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetSize
RECTL vRect;
POINTL vPoint;
- ::WinQueryWindowRect(m_hFrame, &vRect);
+ ::WinQueryWindowRect(GetHWND(), &vRect);
vPoint.x = vRect.xLeft;
//
int bShowCmd
)
{
- HWND hClient = NULLHANDLE;
- SWP vSwp;
-
- //
- // Reset the window position
- //
- WinQueryWindowPos(m_hFrame, &vSwp);
- WinSetWindowPos( GetHwnd()
- ,HWND_TOP
- ,vSwp.x
- ,vSwp.y
- ,vSwp.cx
- ,vSwp.cy
- ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
- );
- ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
- ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
+ ::WinShowWindow(GetHWND(), (BOOL)bShowCmd);
+ m_bIconized = bShowCmd == SWP_MINIMIZE;
} // end of wxFrame::DoShowWindow
bool wxFrame::Show(
{
wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
- ::WinQueryWindowPos(m_hFrame, &vSwp);
+ ::WinQueryWindowPos(GetHWND(), &vSwp);
m_bIconized = vSwp.fl & SWP_MINIMIZE;
- ::WinEnableWindow(m_hFrame, TRUE);
+ ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+ ::WinEnableWindow(GetHWND(), TRUE);
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
}
bool wxFrame::IsIconized() const
{
SWP vSwp;
- bool bIconic;
::WinQueryWindowPos(GetHwnd(), &vSwp);
SWP vSwp;
bool bIconic;
- ::WinQueryWindowPos(m_hFrame, &vSwp);
+ ::WinQueryWindowPos(GetHWND(), &vSwp);
return (vSwp.fl & SWP_MAXIMIZE);
} // end of wxFrame::IsMaximized
if ((m_icon.GetHICON()) != NULLHANDLE)
{
- ::WinSendMsg( m_hFrame
+ ::WinSendMsg( GetHWND()
,WM_SETICON
,(MPARAM)((HPOINTER)m_icon.GetHICON())
,NULL
);
- ::WinSendMsg( m_hFrame
+ ::WinSendMsg( GetHWND()
,WM_UPDATEFRAME
,(MPARAM)FCF_ICON
,(MPARAM)0
)
{
wxStatusBar* pStatusBar = NULL;
+ SWP vSwp;
+ ERRORID vError;
+ wxString sError;
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
,lulStyle
,vId
,rName
- );
+ );
+
+ if( !pStatusBar )
+ return NULL;
+
+ //
+ // to show statusbar
+ //
+ if( ::WinIsWindowShowing(GetHWND()) )
+ ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+
return pStatusBar;
} // end of wxFrame::OnCreateStatusBar
void wxFrame::PositionStatusBar()
{
+ SWP vSwp;
+ ERRORID vError;
+ wxString sError;
+
//
// Native status bar positions itself
//
,nWidth
,nStatbarHeight
);
+ if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ return;
+ }
+ if (!::WinSetWindowPos( m_frameStatusBar->GetHWND()
+ ,HWND_TOP
+ ,vSwp.x
+ ,vSwp.y
+ ,nStatbarWidth
+ ,nStatbarHeight
+ ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER
+ ))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ return;
+ }
}
} // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR
if (!pMenuBar)
{
DetachMenuBar();
- return;
- }
-
- m_frameMenuBar = NULL;
-
- // Can set a menubar several times.
- // TODO: how to prevent a memory leak if you have a currently-unattached
- // menubar? wxWindows assumes that the frame will delete the menu (otherwise
- // there are problems for MDI).
- if (pMenuBar->GetHMenu())
- {
- m_hMenu = pMenuBar->GetHMenu();
- }
- else
- {
- pMenuBar->Detach();
-
- m_hMenu = pMenuBar->Create();
- if (!m_hMenu)
- return;
+ //
+ // Actually remove the menu from the frame
+ //
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
}
-
- //
- // Set the parent and owner of the menubar to be the frame
- //
- if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))
+ else // set new non NULL menu bar
{
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
- }
+ m_frameMenuBar = NULL;
- if (!::WinSetOwner(m_hMenu, m_hFrame))
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ //
+ // Can set a menubar several times.
+ // TODO: how to prevent a memory leak if you have a currently-unattached
+ // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+ // there are problems for MDI).
+ //
+ if (pMenuBar->GetHMenu())
+ {
+ m_hMenu = pMenuBar->GetHMenu();
+ }
+ else
+ {
+ pMenuBar->Detach();
+ m_hMenu = pMenuBar->Create();
+ if (!m_hMenu)
+ return;
+ }
+ InternalSetMenuBar();
+ m_frameMenuBar = pMenuBar;
+ pMenuBar->Attach(this);
}
- InternalSetMenuBar();
-
- m_frameMenuBar = pMenuBar;
- pMenuBar->Attach(this);
//
// Now resize the client to fit the new frame
//
- WinQueryWindowPos(m_hFrame, &vSwp);
- hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR);
+ WinQueryWindowPos(GetHWND(), &vSwp);
+ hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR);
WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
- hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
+ hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL);
WinQueryWindowPos(hHScroll, &vSwpHScroll);
- hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
+ hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL);
WinQueryWindowPos(hVScroll, &vSwpVScroll);
- hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
+ hMenuBar = WinWindowFromID(GetHWND(), FID_MENU);
WinQueryWindowPos(hMenuBar, &vSwpMenu);
WinSetWindowPos( GetHwnd()
,HWND_TOP
void wxFrame::InternalSetMenuBar()
{
- WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ ERRORID vError;
+ wxString sError;
+ //
+ // 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);
+ }
+ WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar
//
, long lStyle
)
{
- /*
- // TODO
- if (show)
+ if (bShow)
{
if (IsFullScreen())
return FALSE;
- m_fsIsShowing = TRUE;
- m_fsStyle = style;
+ m_bFsIsShowing = TRUE;
+ m_lFsStyle = lStyle;
- wxToolBar *theToolBar = GetToolBar();
- wxStatusBar *theStatusBar = GetStatusBar();
+ wxToolBar* pTheToolBar = GetToolBar();
+ wxStatusBar* pTheStatusBar = GetStatusBar();
- int dummyWidth;
+ int nDummyWidth;
- if (theToolBar)
- theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
- if (theStatusBar)
- theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+ if (pTheToolBar)
+ pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+ if (pTheStatusBar)
+ pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
- // zap the toolbar, menubar, and statusbar
-
- if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+ //
+ // Zap the toolbar, menubar, and statusbar
+ //
+ if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
{
- theToolBar->SetSize(-1,0);
- theToolBar->Show(FALSE);
+ pTheToolBar->SetSize(-1,0);
+ pTheToolBar->Show(FALSE);
}
- if (style & wxFULLSCREEN_NOMENUBAR)
- SetMenu((HWND)GetHWND(), (HMENU) NULL);
+ if (lStyle & wxFULLSCREEN_NOMENUBAR)
+ {
+ ::WinSetParent(m_hMenu, GetHWND(), FALSE);
+ ::WinSetOwner(m_hMenu, GetHWND());
+ ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ }
+ //
// Save the number of fields in the statusbar
- if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+ //
+ if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
{
- m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+ m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();
SetStatusBar((wxStatusBar*) NULL);
- delete theStatusBar;
+ delete pTheStatusBar;
}
else
- m_fsStatusBarFields = 0;
+ m_nFsStatusBarFields = 0;
- // zap the frame borders
+ //
+ // Zap the frame borders
+ //
- // save the 'normal' window style
- m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
+ //
+ // Save the 'normal' window style
+ //
+ m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), QWL_STYLE);
- // save the old position, width & height, maximize state
- m_fsOldSize = GetRect();
- m_fsIsMaximized = IsMaximized();
+ //
+ // Save the old position, width & height, maximize state
+ //
+ m_vFsOldSize = GetRect();
+ m_bFsIsMaximized = IsMaximized();
- // decide which window style flags to turn off
- LONG newStyle = m_fsOldWindowStyle;
- LONG offFlags = 0;
+ //
+ // Decide which window style flags to turn off
+ //
+ LONG lNewStyle = m_lFsOldWindowStyle;
+ LONG lOffFlags = 0;
- if (style & wxFULLSCREEN_NOBORDER)
- offFlags |= WS_BORDER;
- if (style & wxFULLSCREEN_NOCAPTION)
- offFlags |= (WS_CAPTION | WS_SYSMENU);
+ if (lStyle & wxFULLSCREEN_NOBORDER)
+ lOffFlags |= FCF_BORDER;
+ if (lStyle & wxFULLSCREEN_NOCAPTION)
+ lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU);
- newStyle &= (~offFlags);
+ lNewStyle &= (~lOffFlags);
- // change our window style to be compatible with full-screen mode
- SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
+ //
+ // Change our window style to be compatible with full-screen mode
+ //
+ ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle);
- // resize to the size of the desktop
- int width, height;
+ //
+ // Resize to the size of the desktop
+ int nWidth;
+ int nHeight;
- RECT rect;
- ::GetWindowRect(GetDesktopWindow(), &rect);
- width = rect.right - rect.left;
- height = rect.bottom - rect.top;
+ RECTL vRect;
- SetSize(width, height);
+ ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+ nWidth = vRect.xRight - vRect.xLeft;
+ //
+ // Rmember OS/2 is backwards!
+ //
+ nHeight = vRect.yTop - vRect.yBottom;
- // now flush the window style cache and actually go full-screen
- SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
+ SetSize( nWidth
+ ,nHeight
+ );
- wxSizeEvent event(wxSize(width, height), GetId());
- GetEventHandler()->ProcessEvent(event);
+ //
+ // Now flush the window style cache and actually go full-screen
+ //
+ ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+ ,HWND_TOP
+ ,0
+ ,0
+ ,nWidth
+ ,nHeight
+ ,SWP_SIZE | SWP_SHOW
+ );
+
+ wxSizeEvent vEvent( wxSize( nWidth
+ ,nHeight
+ )
+ ,GetId()
+ );
+ GetEventHandler()->ProcessEvent(vEvent);
return TRUE;
}
else
if (!IsFullScreen())
return FALSE;
- m_fsIsShowing = FALSE;
+ m_bFsIsShowing = FALSE;
- wxToolBar *theToolBar = GetToolBar();
+ wxToolBar* pTheToolBar = GetToolBar();
- // restore the toolbar, menubar, and statusbar
- if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR))
+ //
+ // Restore the toolbar, menubar, and statusbar
+ //
+ if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
{
- theToolBar->SetSize(-1, m_fsToolBarHeight);
- theToolBar->Show(TRUE);
+ pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+ pTheToolBar->Show(TRUE);
}
- if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+ if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
{
- CreateStatusBar(m_fsStatusBarFields);
- PositionStatusBar();
+ CreateStatusBar(m_nFsStatusBarFields);
+// PositionStatusBar();
}
- if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
- SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
-
- Maximize(m_fsIsMaximized);
- SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
- SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
- m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
-
+ if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
+ {
+ ::WinSetParent(m_hMenu, GetHWND(), FALSE);
+ ::WinSetOwner(m_hMenu, GetHWND());
+ ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ }
+ Maximize(m_bFsIsMaximized);
+
+ ::WinSetWindowULong( (HWND)GetHWND()
+ ,QWL_STYLE
+ ,(ULONG)m_lFsOldWindowStyle
+ );
+ ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+ ,HWND_TOP
+ ,m_vFsOldSize.x
+ ,m_vFsOldSize.y
+ ,m_vFsOldSize.width
+ ,m_vFsOldSize.height
+ ,SWP_SIZE | SWP_SHOW
+ );
return TRUE;
}
-*/
- return TRUE;
} // end of wxFrame::ShowFullScreen
//
HWND hTitlebar = NULLHANDLE;
HWND hHScroll = NULLHANDLE;
HWND hVScroll = NULLHANDLE;
- SWP vSwp;
- SWP vSwpClient;
- SWP vSwpTitlebar;
- SWP vSwpVScroll;
- SWP vSwpHScroll;
+ SWP vSwp[10];
+ RECTL vRect[10];
USHORT uCtlCount;
m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
if (ulStyle == wxDEFAULT_FRAME_STYLE)
ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
- FCF_MINMAX | FCF_VERTSCROLL | FCF_HORZSCROLL | FCF_TASKLIST;
+ FCF_MINMAX | FCF_TASKLIST;
else
{
if ((ulStyle & wxCAPTION) == wxCAPTION)
else
ulCreateFlags = FCF_NOMOVEWITHOWNER;
+ if ((ulStyle & wxVSCROLL) == wxVSCROLL)
+ ulCreateFlags |= FCF_VERTSCROLL;
+ if ((ulStyle & wxHSCROLL) == wxHSCROLL)
+ ulCreateFlags |= FCF_HORZSCROLL;
if (ulStyle & wxMINIMIZE_BOX)
ulCreateFlags |= FCF_MINBUTTON;
if (ulStyle & wxMAXIMIZE_BOX)
//
// Create the frame window
//
- if ((m_hFrame = ::WinCreateWindow( hParent // Frame is parent
- ,WC_FRAME // standard frame class
- ,(PSZ)zTitle // Window title
- ,0 // No styles
- ,0, 0, 0, 0 // Window position
- ,NULLHANDLE // Owner
- ,HWND_TOP // Sibling
- ,(ULONG)nId // ID
- ,(PVOID)&flFrameCtlData // Creation data
- ,NULL // Window Pres Params
- )) == 0L)
- {
- return FALSE;
- }
- if (!wxWindow::OS2Create( m_hFrame
- ,wxFrameClassName
- ,NULL
- ,0L
- ,0L
- ,0L
- ,0L
- ,0L
+ if (!wxWindow::OS2Create( hParent
+ ,WC_FRAME
+ ,(PSZ)zTitle
+ ,0
+ ,0, 0, 0, 0
,NULLHANDLE
,HWND_TOP
- ,(unsigned long)FID_CLIENT
- ,NULL
+ ,(ULONG)nId
+ ,(PVOID)&vFrameCtlData
,NULL
))
{
return FALSE;
}
+ //
+ // Now need to subclass window.
+ //
+
+ //SubclassWin(GetHWND());
+
+// ::WinCreateWindow(GetHWND(), WC_LISTBOX, "", WS_VISIBLE, 0, 0,
+// 0, 0, GetHWND(), HWND_TOP, FID_CLIENT, NULL, NULL);
//
// Now size everything. If adding a menu the client will need to be resized.
//
- if (!::WinSetWindowPos( m_hFrame
+
+ if (!::WinSetWindowPos( GetHWND()
,HWND_TOP
,nX
,nY
,nWidth
,nHeight
- ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
+ ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
))
return FALSE;
-
- uCtlCount = ::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)pSwp, (MPARAM)pRect);
+/*
+ uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
for (int i = 0; i < uCtlCount; i++)
{
- if (pSwp[i].hwnd == m_hFrame)
- memcpy(m_vSwp, pSwp[i], sizeof(SWP));
- else if (pSwp[i].hwnd == m_hVScroll)
- memcpy(m_vSwpVScroll, pSwp[i], sizeof(SWP));
- else if (pSwp[i].hwnd == m_hHScroll)
- memcpy(m_vSwpVScroll, pSwp[i], sizeof(SWP));
- else if (pSwp[i].hwnd == m_hTitleBar)
- memcpy(m_vSwpTitleBar, pSwp[i], sizeof(SWP));
- }
-
- //
- // Now set the size of the client
- //
- WinSetWindowPos( hClient
- ,HWND_TOP
- ,SV_CXSIZEBORDER/2
- ,(SV_CYSIZEBORDER/2) + m_vSwpHScroll.cy/2
- ,m_vSwp.cx - ((SV_CXSIZEBORDER + 1) + m_vSwpVScroll.cx)
- ,m_vSwp.cy - ((SV_CYSIZEBORDER + 1) + m_vSwpTitlebar.cy + m_vSwpHScroll.cy/2)
- ,SWP_SIZE | SWP_MOVE
- );
-
- //
- // Set the client window's background, otherwise it is transparent!
- //
+ if (vSwp[i].hwnd == GetHWND())
+ memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
+ else if (vSwp[i].hwnd == m_hVScroll)
+ memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
+ else if (vSwp[i].hwnd == m_hHScroll)
+ memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
+ else if (vSwp[i].hwnd == m_hTitleBar)
+ memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
+ }*/
return TRUE;
} // end of wxFrame::OS2Create
WXMSG* pMsg
)
{
- if (wxWindow::OS2TranslateMessage(pMsg))
- return TRUE;
//
// try the menu bar accels
//
return FALSE;
const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable();
- return rAcceleratorTable.Translate(this, pMsg);
+ return rAcceleratorTable.Translate(GetHWND(), pMsg);
} // end of wxFrame::OS2TranslateMessage
// ---------------------------------------------------------------------------
{
RECTL vRect;
- if (::WinQueryUpdateRect(m_hFrame, &vRect))
+ if (::WinQueryUpdateRect(GetHWND(), &vRect))
{
if (m_bIconized)
{
HPOINTER hIcon;
if (m_icon.Ok())
- hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+ hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;
// is being processed
//
RECTL vRect2;
- HPS hPs = ::WinBeginPaint(m_hFrame, NULLHANDLE, &vRect2);
+ HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2);
//
// Erase background before painting or we get white background
}
else
{
+/* DosBeep(500,500);
+ HPS hPS;
+ RECTL vRect;
+
+ hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
+ WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
+ WinEndPaint(hPS);*/
+
return wxWindow::HandlePaint();
}
}
}
#endif // wxUSE_NATIVE_STATUSBAR
- PositionStatusBar();
+// PositionStatusBar();
PositionToolBar();
wxSizeEvent vEvent( wxSize( nX
,nY
//
// Handle here commands from menus and accelerators
//
- if (nCmd == 0 || nCmd == 1)
+ if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
{
if (wxCurrentPopupMenu)
{
, WXHMENU hMenu
)
{
- int nMenuItem;
+// int nMenuItem;
+/* This is wrong section according to IBM's documentation
if (nFlags == 0xFFFF && hMenu == 0)
{
//
//
return FALSE;
}
- wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem);
+*/
- vEvent.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(vEvent);
+ if( !nFlags )
+ {
+ MENUITEM mItem;
+ MRESULT rc;
+
+ rc = WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
+
+ if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
+ {
+ wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
+
+ vEvent.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM
+ }
+ }
+ return TRUE;
} // end of wxFrame::HandleMenuSelect
// ---------------------------------------------------------------------------
WXHWND hWnd;
UnpackCommand( (WXWPARAM)wParam
- ,(WXLPARAM)lParam
- ,&wId
- ,&hWnd
- ,&wCmd
- );
+ ,(WXLPARAM)lParam
+ ,&wId
+ ,&hWnd
+ ,&wCmd
+ );
+
bProcessed = HandleCommand( wId
,wCmd
,(WXHWND)hWnd
,wFlags
,hMenu
);
+ mRc = (MRESULT)TRUE;
}
break;
// Return TRUE to request PM to paint the window background
// in SYSCLR_WINDOW.
//
- bProcessed = TRUE;
+ bProcessed = TRUE;
mRc = (MRESULT)(TRUE);
break;
HPOINTER hIcon;
if (m_icon.Ok())
- hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+ hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;
mRc = (MRESULT)hIcon;
case WM_SIZE:
bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
break;
+
+ case WM_QUERYFRAMECTLCOUNT:
+ {
+ USHORT itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam));
+ if(m_frameStatusBar)
+ ++itemCount;
+ bProcessed = TRUE;
+ mRc = MRFROMSHORT( itemCount );
+ }
+ break;
+
+ case WM_FORMATFRAME:
+ {
+ PSWP pSWP = 0;
+ USHORT usClient = 0;
+ SWP swp;
+ USHORT itemCount;
+ char s[128];
+
+ itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam));
+ pSWP = (PSWP)PVOIDFROMMP( wParam );
+
+ while(pSWP[usClient].hwnd != WinWindowFromID(GetHWND(), FID_CLIENT)
+ && usClient < itemCount)
+ usClient++;
+
+ if(m_frameStatusBar)
+ {
+ int height;
+
+ m_frameStatusBar->GetSize(NULL, &height);
+
+ if(usClient == itemCount)
+ {
+ // frame has no client window
+ // using another method of calculation
+ RECTL wRectl;
+
+ ::WinQueryWindowRect(GetHWND(), &wRectl);
+ ::WinMapWindowPoints(GetHWND(), HWND_DESKTOP, (PPOINTL)&wRectl, 2);
+ ::WinCalcFrameRect(GetHWND(), &wRectl, TRUE);
+ ::WinMapWindowPoints(HWND_DESKTOP, GetHWND(), (PPOINTL)&wRectl, 2);
+
+ pSWP[itemCount].x = wRectl.xLeft;
+ pSWP[itemCount].y = wRectl.yBottom;
+ pSWP[itemCount].cx = wRectl.xRight - wRectl.xLeft - 1;
+ pSWP[itemCount].cy = height;
+ pSWP[itemCount].fl = SWP_SIZE |
+ SWP_MOVE |
+ SWP_SHOW;
+ pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND();
+ pSWP[itemCount].hwndInsertBehind = HWND_TOP;
+ ++itemCount;
+ }
+ else
+ {
+ pSWP[itemCount].x = pSWP[usClient].x;
+ pSWP[itemCount].y = pSWP[usClient].y;
+ pSWP[itemCount].cx = pSWP[usClient].cx;
+ pSWP[itemCount].cy = height;
+ pSWP[itemCount].fl = SWP_SIZE |
+ SWP_MOVE |
+ SWP_SHOW;
+ pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND();
+ pSWP[itemCount].hwndInsertBehind = HWND_TOP;
+ pSWP[usClient].cy -= height;
+ pSWP[usClient].y += height;
+
+ ++itemCount;
+ }
+ }
+ bProcessed = TRUE;
+ mRc = MRFROMSHORT(itemCount);
+ }
+ break;
}
if (!bProcessed )
,wParam
,lParam
);
- return (MRESULT)0;
+ return (MRESULT)mRc;
} // wxFrame::OS2WindowProc
+
+void wxFrame::SetClient(WXHWND c_Hwnd)
+{
+ // Are we really need to implement it?
+}
+
+void wxFrame::SetClient(wxWindow* c_Window)
+{
+ wxWindow *oldClient = this->GetClient();
+ bool clientHasFocus = oldClient && (oldClient == wxWindow::FindFocus());
+
+ if(oldClient == c_Window) // nothing to do
+ return;
+
+ if(c_Window == NULL) // just need to remove old client
+ {
+ if(oldClient == NULL) // nothing to do
+ return;
+
+ if( clientHasFocus )
+ this->SetFocus();
+
+ oldClient->Enable( FALSE );
+ oldClient->Show( FALSE );
+ ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId());
+ // to avoid OS/2 bug need to update frame
+ ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+ return;
+ }
+
+ // else need to change client
+ if( clientHasFocus )
+ this->SetFocus();
+
+ ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
+ if( oldClient )
+ {
+ oldClient->Enable( FALSE );
+ oldClient->Show( FALSE );
+ ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId());
+ }
+
+ c_Window->Reparent( this );
+ ::WinSetWindowUShort(c_Window->GetHWND(), QWS_ID, FID_CLIENT);
+
+ ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE);
+ c_Window->Enable();
+ c_Window->Show(); // ensure client is showing
+
+ if( this->IsShown() )
+ {
+ this->Show();
+ ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+ }
+}
+
+wxWindow *wxFrame::GetClient()
+{
+ return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT));
+}
projects / wxWidgets.git / blobdiff