Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Statusbar support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-10-02 02:35:58 +00:00
parent 66181ca50d
commit ced50b3323
4 changed files with 204 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/os2/frame.h
View File

@@ -140,6 +140,10 @@ public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips #endif // tooltips
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
protected: protected:
// common part of all ctors // common part of all ctors
void Init(void); void Init(void);

42
src/os2/app.cpp
View File

@@ -183,8 +183,8 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxFrameClassName ,wxFrameClassName
,(PFNWP)wxWndProc ,NULL
,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT | CS_FRAME ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
,sizeof(ULONG) ,sizeof(ULONG)
)) ))
{ {
@@ -196,7 +196,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxFrameClassNameNoRedraw ,wxFrameClassNameNoRedraw
,(PFNWP)wxWndProc ,NULL
,0 ,0
,0 ,0
)) ))
@@ -209,7 +209,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxMDIFrameClassName ,wxMDIFrameClassName
,(PFNWP)wxWndProc ,NULL
,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
,0 ,0
)) ))
@@ -222,7 +222,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxMDIFrameClassNameNoRedraw ,wxMDIFrameClassNameNoRedraw
,(PFNWP)wxWndProc ,NULL
,0 ,0
,0 ,0
)) ))
@@ -235,7 +235,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxMDIChildFrameClassName ,wxMDIChildFrameClassName
,(PFNWP)wxWndProc ,NULL
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
,0 ,0
)) ))
@@ -248,7 +248,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxMDIChildFrameClassNameNoRedraw ,wxMDIChildFrameClassNameNoRedraw
,(PFNWP)wxWndProc ,NULL
,CS_HITTEST ,CS_HITTEST
,0 ,0
)) ))
@@ -261,7 +261,7 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxPanelClassName ,wxPanelClassName
,(PFNWP)wxWndProc ,NULL
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
,0 ,0
)) ))
@@ -274,8 +274,8 @@ bool wxApp::RegisterWindowClasses(
if (!::WinRegisterClass( vHab if (!::WinRegisterClass( vHab
,wxCanvasClassName ,wxCanvasClassName
,(PFNWP)wxWndProc ,NULL
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT ,0 // CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
,0 ,0
)) ))
{ {
@@ -651,11 +651,11 @@ int wxApp::MainLoop()
#if wxUSE_THREADS #if wxUSE_THREADS
wxMutexGuiLeaveOrEnter(); wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
while (!Pending() && ProcessIdle()) while (/*Pending() &&*/ ProcessIdle())
{ {
// wxUsleep(10000); // wxUsleep(10000);
} }
DoMessage(); DoMessage();
} }
return (int)svCurrentMsg.mp1; return (int)svCurrentMsg.mp1;
} // end of wxApp::MainLoop } // end of wxApp::MainLoop
@@ -749,11 +749,13 @@ bool wxApp::ProcessMessage(
if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0) if((CHARMSG(pChmsg)->fs & (KC_ALT | KC_CTRL)) && CHARMSG(pChmsg)->chr != 0)
CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch); CHARMSG(pChmsg)->chr = (USHORT)wxToupper((UCHAR)uSch);
for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
{ for(pWnd = pWndThis; pWnd; pWnd = pWnd->GetParent() )
if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE) {
break; if((bRc = pWnd->OS2TranslateMessage(pWxmsg)) == TRUE)
} break;
}
if(!bRc) // untranslated, should restore original value if(!bRc) // untranslated, should restore original value
CHARMSG(pChmsg)->chr = uSch; CHARMSG(pChmsg)->chr = uSch;
} }
@@ -778,7 +780,7 @@ void wxApp::OnIdle(
// //
// Avoid recursion (via ProcessEvent default case) // Avoid recursion (via ProcessEvent default case)
// //
if (sbInOnIdle ) if (sbInOnIdle)
return; return;
sbInOnIdle = TRUE; sbInOnIdle = TRUE;

217
src/os2/frame.cpp
View File

@@ -178,6 +178,7 @@ wxFrame::~wxFrame()
::WinPostMsg(NULL, WM_QUIT, 0, 0); ::WinPostMsg(NULL, WM_QUIT, 0, 0);
} }
} }
wxModelessWindows.DeleteObject(this); wxModelessWindows.DeleteObject(this);
// //
@@ -371,6 +372,7 @@ bool wxFrame::Show(
::WinQueryWindowPos(GetHWND(), &vSwp); ::WinQueryWindowPos(GetHWND(), &vSwp);
m_bIconized = vSwp.fl & SWP_MINIMIZE; m_bIconized = vSwp.fl & SWP_MINIMIZE;
::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
::WinEnableWindow(GetHWND(), TRUE); ::WinEnableWindow(GetHWND(), TRUE);
vEvent.SetEventObject(this); vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent); GetEventHandler()->ProcessEvent(vEvent);
@@ -475,51 +477,22 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
SWP vSwp; SWP vSwp;
ERRORID vError; ERRORID vError;
wxString sError; wxString sError;
HWND hWnd;
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
,lulStyle ,lulStyle
,vId ,vId
,rName ,rName
); );
//
// The default parent set for the Statusbar is m_hWnd which, of course,
// is the handle to the client window of the frame. We don't want that,
// so we have to set the parent to actually be the Frame.
//
hWnd = pStatusBar->GetHWND();
if (!::WinSetParent(hWnd, GetHWND(), FALSE))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for statusbar. Error: %s\n", sError);
return NULL;
}
// if( !pStatusBar )
// Also we need to reset it positioning to enable the SHOW attribute
//
if (!::WinQueryWindowPos((HWND)pStatusBar->GetHWND(), &vSwp))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError("Error querying frame for statusbar position. Error: %s\n", sError);
return NULL; return NULL;
}
if (!::WinSetWindowPos( (HWND)pStatusBar->GetHWND() //
,HWND_TOP // to show statusbar
,vSwp.cx //
,vSwp.cy if( ::WinIsWindowShowing(GetHWND()) )
,vSwp.x ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
,vSwp.y
,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER
))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError("Error setting statusbar position. Error: %s\n", sError);
return NULL;
}
return pStatusBar; return pStatusBar;
} // end of wxFrame::OnCreateStatusBar } // end of wxFrame::OnCreateStatusBar
@@ -567,10 +540,10 @@ void wxFrame::PositionStatusBar()
} }
if (!::WinSetWindowPos( m_frameStatusBar->GetHWND() if (!::WinSetWindowPos( m_frameStatusBar->GetHWND()
,HWND_TOP ,HWND_TOP
,nStatbarWidth
,nStatbarHeight
,vSwp.x ,vSwp.x
,vSwp.y ,vSwp.y
,nStatbarWidth
,nStatbarHeight
,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER
)) ))
{ {
@@ -860,7 +833,7 @@ bool wxFrame::ShowFullScreen(
if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0)) if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
{ {
CreateStatusBar(m_nFsStatusBarFields); CreateStatusBar(m_nFsStatusBarFields);
PositionStatusBar(); // PositionStatusBar();
} }
if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
@@ -1004,6 +977,14 @@ bool wxFrame::OS2Create(
return FALSE; 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. // Now size everything. If adding a menu the client will need to be resized.
// //
@@ -1017,7 +998,7 @@ bool wxFrame::OS2Create(
,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
)) ))
return FALSE; return FALSE;
/*
uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect)); uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
for (int i = 0; i < uCtlCount; i++) for (int i = 0; i < uCtlCount; i++)
{ {
@@ -1029,7 +1010,7 @@ bool wxFrame::OS2Create(
memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP)); memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
else if (vSwp[i].hwnd == m_hTitleBar) else if (vSwp[i].hwnd == m_hTitleBar)
memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP)); memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
} }*/
return TRUE; return TRUE;
} // end of wxFrame::OS2Create } // end of wxFrame::OS2Create
@@ -1352,7 +1333,7 @@ bool wxFrame::HandleSize(
} }
#endif // wxUSE_NATIVE_STATUSBAR #endif // wxUSE_NATIVE_STATUSBAR
PositionStatusBar(); // PositionStatusBar();
PositionToolBar(); PositionToolBar();
wxSizeEvent vEvent( wxSize( nX wxSizeEvent vEvent( wxSize( nX
,nY ,nY
@@ -1388,7 +1369,7 @@ bool wxFrame::HandleCommand(
// //
// Handle here commands from menus and accelerators // Handle here commands from menus and accelerators
// //
if (nCmd == 0 || nCmd == 1) if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
{ {
if (wxCurrentPopupMenu) if (wxCurrentPopupMenu)
{ {
@@ -1487,11 +1468,12 @@ MRESULT wxFrame::OS2WindowProc(
WXHWND hWnd; WXHWND hWnd;
UnpackCommand( (WXWPARAM)wParam UnpackCommand( (WXWPARAM)wParam
,(WXLPARAM)lParam ,(WXLPARAM)lParam
,&wId ,&wId
,&hWnd ,&hWnd
,&wCmd ,&wCmd
); );
bProcessed = HandleCommand( wId bProcessed = HandleCommand( wId
,wCmd ,wCmd
,(WXHWND)hWnd ,(WXHWND)hWnd
@@ -1548,6 +1530,81 @@ MRESULT wxFrame::OS2WindowProc(
case WM_SIZE: case WM_SIZE:
bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
break; 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 ) if (!bProcessed )
@@ -1558,3 +1615,63 @@ MRESULT wxFrame::OS2WindowProc(
return (MRESULT)mRc; return (MRESULT)mRc;
} // wxFrame::OS2WindowProc } // 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));
}

16
src/os2/window.cpp
View File

@@ -1718,9 +1718,14 @@ void wxWindow::UnpackCommand(
, WORD* pCmd , WORD* pCmd
) )
{ {
/*
*pId = LOWORD(wParam); *pId = LOWORD(wParam);
*phWnd = (WXHWND)lParam; *phWnd = (WXHWND)lParam;
*pCmd = HIWORD(wParam); *pCmd = HIWORD(wParam);
*/
*pId = LOWORD(wParam);
*phWnd = NULL; // or may be GetHWND() ?
*pCmd = LOWORD(lParam);
} // end of wxWindow::UnpackCommand } // end of wxWindow::UnpackCommand
void wxWindow::UnpackActivate( void wxWindow::UnpackActivate(
@@ -1802,7 +1807,7 @@ MRESULT EXPENTRY wxWndProc(
pWnd->SetHWND((WXHWND)hWnd); pWnd->SetHWND((WXHWND)hWnd);
} }
MRESULT rc = (MRESULT)FALSE; MRESULT rc = (MRESULT)0;
// //
@@ -1821,6 +1826,7 @@ MRESULT EXPENTRY wxWndProc(
else else
rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
} }
return rc; return rc;
} // end of wxWndProc } // end of wxWndProc
@@ -2336,10 +2342,10 @@ bool wxWindow::OS2Create(
{ {
ERRORID vError; ERRORID vError;
wxString sError; wxString sError;
long lX1 = (long)CW_USEDEFAULT; long lX1 = 0L;
long lY1 = 0L; long lY1 = 0L;
long lWidth1 = (long)CW_USEDEFAULT; long lWidth1 = 20L;
long lHeight1 = 100L; long lHeight1 = 20L;
int nControlId = 0; int nControlId = 0;
// //
@@ -2425,7 +2431,7 @@ bool wxWindow::OS2Create(
wxAssociateWinWithHandle((HWND)m_hWnd wxAssociateWinWithHandle((HWND)m_hWnd
,this ,this
); );
// //
// Now need to subclass window. // Now need to subclass window.
// //