/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: src/os2/frame.cpp
// Purpose: wxFrame
// Author: David Webster
// Modified by:
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
- #include "wx/defs.h"
#include "wx/object.h"
#include "wx/dynarray.h"
#include "wx/list.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"
- #include "wx/setup.h"
#include "wx/frame.h"
#include "wx/menu.h"
#include "wx/app.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
#include "wx/mdi.h"
+ #include "wx/toolbar.h"
+ #include "wx/statusbr.h"
+ #include "wx/menuitem.h"
#endif // WX_PRECOMP
#include "wx/os2/private.h"
-#if wxUSE_STATUSBAR
- #include "wx/statusbr.h"
- #include "wx/generic/statusbr.h"
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
- #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
-extern wxWindowList wxModelessWindows;
-extern wxList WXDLLEXPORT wxPendingDelete;
-
#if wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu;
#endif
-extern void wxAssociateWinWithHandle( HWND hWnd
- ,wxWindowOS2* pWin
- );
-
// ----------------------------------------------------------------------------
// event tables
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
- EVT_ACTIVATE(wxFrame::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
// ============================================================================
// implementation
// ============================================================================
#if wxUSE_STATUSBAR
#if wxUSE_NATIVE_STATUSBAR
- bool wxFrame::m_bUseNativeStatusBar = TRUE;
+ bool wxFrame::m_bUseNativeStatusBar = true;
#else
- bool wxFrame::m_bUseNativeStatusBar = FALSE;
+ bool wxFrame::m_bUseNativeStatusBar = false;
#endif
#endif //wxUSE_STATUSBAR
m_nFsStatusBarHeight = 0;
m_nFsToolBarHeight = 0;
m_hWndToolTip = 0L;
- m_bWasMinimized = FALSE;
- m_pWinLastFocused = NULL;
+ m_bWasMinimized = false;
m_frameMenuBar = NULL;
memset(&m_vSwpVScroll, 0, sizeof(SWP));
memset(&m_vSwpStatusBar, 0, sizeof(SWP));
memset(&m_vSwpToolBar, 0, sizeof(SWP));
- m_bIconized = FALSE;
+ m_bIconized = false;
} // end of wxFrame::Init
-bool wxFrame::Create(
- wxWindow* pParent
-, wxWindowID vId
-, const wxString& rsTitle
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-, const wxString& rsName
-)
+bool wxFrame::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxString& rsTitle,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxString& rsName )
{
if (!wxTopLevelWindow::Create( pParent
,vId
,lStyle
,rsName
))
- return FALSE;
- wxModelessWindows.Append(this);
- return TRUE;
+ return false;
+ return true;
} // end of wxFrame::Create
wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
+ SendDestroyEvent();
+
DeleteAllBars();
} // end of wxFrame::~wxFrame
//
// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
//
void wxFrame::DoSetClientSize(
int nWidth
, int nHeight
)
{
- wxStatusBar* pStatusBar = GetStatusBar();
-
//
// Statusbars are not part of the OS/2 Client but parent frame
// so no statusbar consideration
);
}
-// generate an artificial resize event
-void wxFrame::SendSizeEvent()
-{
- if (!m_bIconized)
- {
- RECTL vRect = wxGetWindowRect(GetHwnd());
-
- (void)::WinPostMsg( m_hFrame
- ,WM_SIZE
- ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
- ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
- );
- }
-}
-
#if wxUSE_STATUSBAR
wxStatusBar* wxFrame::OnCreateStatusBar(
int nNumber
)
{
wxStatusBar* pStatusBar = NULL;
- SWP vSwp;
- ERRORID vError;
wxString sError;
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
// Set the height according to the font and the border size
//
vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason
- vDC.GetTextExtent( "X"
+ vDC.GetTextExtent( wxT("X")
,NULL
,&nY
);
int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
- pStatusBar->SetSize( -1
- ,-1
- ,-1
+ pStatusBar->SetSize( wxDefaultCoord
+ ,wxDefaultCoord
+ ,wxDefaultCoord
,nHeight
);
- ::WinSetParent( pStatusBar->GetHWND()
- ,m_hFrame
- ,FALSE
- );
- ::WinSetOwner( pStatusBar->GetHWND()
- ,m_hFrame
- );
+ ::WinSetParent( pStatusBar->GetHWND(), m_hFrame, FALSE );
+ ::WinSetOwner( pStatusBar->GetHWND(), m_hFrame);
//
// to show statusbar
//
int nY;
int nStatbarWidth;
int nStatbarHeight;
- HWND hWndClient;
RECTL vRect;
RECTL vFRect;
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for StautsBar. Error: %s\n", sError);
+ wxLogError(wxT("Error setting parent for StatusBar. Error: %s\n"), sError.c_str());
return;
}
}
} // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR
+wxToolBar* wxFrame::OnCreateToolBar( long lStyle, wxWindowID vId, const wxString& rsName )
+{
+ wxToolBar* pToolBar = wxFrameBase::OnCreateToolBar( lStyle
+ ,vId
+ ,rsName
+ );
+
+ ::WinSetParent( pToolBar->GetHWND(), m_hFrame, FALSE);
+ ::WinSetOwner( pToolBar->GetHWND(), m_hFrame);
+ return pToolBar;
+} // end of WinGuiBase_CFrame::OnCreateToolBar
+#endif
+
#if wxUSE_MENUS_NATIVE
void wxFrame::DetachMenuBar()
{
wxMenuBar* pMenuBar
)
{
- ERRORID vError;
wxString sError;
- HWND hTitlebar = NULLHANDLE;
- HWND hHScroll = NULLHANDLE;
- HWND hVScroll = NULLHANDLE;
- HWND hMenuBar = NULLHANDLE;
- SWP vSwp;
- SWP vSwpTitlebar;
- SWP vSwpVScroll;
- SWP vSwpHScroll;
- SWP vSwpMenu;
if (!pMenuBar)
{
//
// 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
+ // menubar? wxWidgets assumes that the frame will delete the menu (otherwise
// there are problems for MDI).
//
if (pMenuBar->GetHMenu())
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
}
if (!::WinSetOwner(m_hMenu, m_hFrame))
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ wxLogError(wxT("Error setting parent for submenu. Error: %s\n"), sError.c_str());
}
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar
wxSysColourChangedEvent vEvent2;
vEvent2.SetEventObject(m_frameStatusBar);
- m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
+ m_frameStatusBar->HandleWindowEvent(vEvent2);
}
#endif //wxUSE_STATUSBAR
wxWindow::OnSysColourChanged(rEvent);
} // end of wxFrame::OnSysColourChanged
-// Pass TRUE to show full screen, FALSE to restore.
-bool wxFrame::ShowFullScreen(
- bool bShow
-, long lStyle
-)
+// Pass true to show full screen, false to restore.
+bool wxFrame::ShowFullScreen( bool bShow, long lStyle )
{
if (bShow)
{
if (IsFullScreen())
- return FALSE;
+ return false;
- m_bFsIsShowing = TRUE;
+ m_bFsIsShowing = true;
m_lFsStyle = lStyle;
#if wxUSE_TOOLBAR
//
if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
{
- pTheToolBar->SetSize(-1,0);
- pTheToolBar->Show(FALSE);
+ pTheToolBar->SetSize(wxDefaultCoord,0);
+ pTheToolBar->Show(false);
}
#endif //wxUSE_TOOLBAR
if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
{
m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();
- SetStatusBar((wxStatusBar*) NULL);
+ SetStatusBar(NULL);
delete pTheStatusBar;
}
else
//
// Decide which window style flags to turn off
//
- LONG lNewStyle = m_lFsOldWindowStyle;
- LONG lOffFlags = 0;
+ LONG lNewStyle = m_lFsOldWindowStyle;
+ LONG lOffFlags = 0;
if (lStyle & wxFULLSCREEN_NOBORDER)
lOffFlags |= FCF_BORDER;
::WinQueryWindowRect(HWND_DESKTOP, &vRect);
nWidth = vRect.xRight - vRect.xLeft;
//
- // Rmember OS/2 is backwards!
+ // Remember OS/2 is backwards!
//
nHeight = vRect.yTop - vRect.yBottom;
- SetSize( nWidth
- ,nHeight
- );
+ SetSize( nWidth, nHeight);
//
// Now flush the window style cache and actually go full-screen
,SWP_SIZE | SWP_SHOW
);
- wxSizeEvent vEvent( wxSize( nWidth
- ,nHeight
- )
- ,GetId()
- );
+ wxSize sz( nWidth, nHeight );
+ wxSizeEvent vEvent( sz, GetId() );
- GetEventHandler()->ProcessEvent(vEvent);
- return TRUE;
+ HandleWindowEvent(vEvent);
+ return true;
}
else
{
if (!IsFullScreen())
- return FALSE;
+ return false;
- m_bFsIsShowing = FALSE;
+ m_bFsIsShowing = false;
#if wxUSE_TOOLBAR
wxToolBar* pTheToolBar = GetToolBar();
//
if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
{
- pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
- pTheToolBar->Show(TRUE);
+ pTheToolBar->SetSize(wxDefaultCoord, m_nFsToolBarHeight);
+ pTheToolBar->Show(true);
}
#endif //wxUSE_TOOLBAR
,m_vFsOldSize.height
,SWP_SIZE | SWP_SHOW
);
- return TRUE;
}
+ return wxFrameBase::ShowFullScreen(bShow, lStyle);
} // end of wxFrame::ShowFullScreen
//
// Frame window
//
-//
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-//
-void wxFrame::OnActivate(
- wxActivateEvent& rEvent
-)
-{
- if ( rEvent.GetActive() )
- {
- // restore focus to the child which was last focused
- wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
-
- wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
- : NULL;
- if (!pParent)
- {
- pParent = this;
- }
-
- wxSetFocusToChild( pParent
- ,&m_pWinLastFocused
- );
- }
- else // deactivating
- {
- //
- // Remember the last focused child if it is our child
- //
- m_pWinLastFocused = FindFocus();
-
- for (wxWindowList::Node* pNode = GetChildren().GetFirst();
- pNode;
- pNode = pNode->GetNext())
- {
- // FIXME all this is totally bogus - we need to do the same as wxPanel,
- // but how to do it without duplicating the code?
-
- // restore focus
- wxWindow* pChild = pNode->GetData();
-
- if (!pChild->IsTopLevel()
-#if wxUSE_TOOLBAR
- && !wxDynamicCast(pChild, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
- && !wxDynamicCast(pChild, wxStatusBar)
-#endif // wxUSE_STATUSBAR
- )
- {
- pChild->SetFocus();
- return;
- }
- }
- }
-} // end of wxFrame::OnActivate
-
// ----------------------------------------------------------------------------
// wxFrame size management: we exclude the areas taken by menu/status/toolbars
// from the client area, so the client area is what's really available for the
// Checks if there is a toolbar, and returns the first free client position
wxPoint wxFrame::GetClientAreaOrigin() const
{
- wxPoint vPoint(0, 0);
+ wxPoint vPoint = wxTopLevelWindow::GetClientAreaOrigin();
-#if wxUSE_TOOLBAR
- if (GetToolBar())
- {
- int nWidth;
- int nHeight;
-
- GetToolBar()->GetSize( &nWidth
- ,&nHeight
- );
-
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
- {
- vPoint.x += nWidth;
- }
- else
- {
- // PM is backwards from windows
- vPoint.y += nHeight;
- }
- }
-#endif //wxUSE_TOOLBAR
+ //
+ // In OS/2 the toolbar and statusbar are frame extensions so there is no
+ // adjustment. The client is supposedly resized for a toolbar in OS/2
+ // as it is for the status bar.
+ //
return vPoint;
} // end of wxFrame::GetClientAreaOrigin
void wxFrame::PositionToolBar()
{
- HWND hWndClient;
- RECTL vRect;
+ wxToolBar* pToolBar = GetToolBar();
+ wxCoord vWidth;
+ wxCoord vHeight;
+ wxCoord vTWidth;
+ wxCoord vTHeight;
- ::WinQueryWindowRect(GetHwnd(), &vRect);
+ if (!pToolBar)
+ return;
-#if wxUSE_STATUSBAR
- if (GetStatusBar())
+ RECTL vRect;
+ RECTL vFRect;
+ wxPoint vPos;
+
+ ::WinQueryWindowRect(m_hFrame, &vRect);
+ vPos.y = (wxCoord)vRect.yTop;
+ ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+ vFRect = vRect;
+ ::WinCalcFrameRect(m_hFrame, &vRect, TRUE);
+
+ vPos.y = (wxCoord)(vFRect.yTop - vRect.yTop);
+ pToolBar->GetSize( &vTWidth
+ ,&vTHeight
+ );
+
+ if (pToolBar->GetWindowStyleFlag() & wxTB_TOP)
{
- int nStatusX;
- int nStatusY;
+ vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
+ pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
+ ,vPos.y
+ ,vWidth
+ ,vTHeight
+ );
+ }
+ else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
+ {
+ wxCoord vSwidth = 0;
+ wxCoord vSheight = 0;
- GetStatusBar()->GetClientSize( &nStatusX
- ,&nStatusY
+ if (m_frameStatusBar)
+ m_frameStatusBar->GetSize( &vSwidth
+ ,&vSheight
);
- // PM is backwards from windows
- vRect.yBottom += nStatusY;
+ vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
+ pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
+ ,vFRect.yTop - vRect.yBottom - vTHeight - vSheight
+ ,vWidth
+ ,vTHeight
+ );
}
-#endif // wxUSE_STATUSBAR
-
- if ( m_frameToolBar )
+ else if (pToolBar->GetWindowStyleFlag() & wxTB_LEFT)
{
- int nToolbarWidth;
- int nToolbarHeight;
+ wxCoord vSwidth = 0;
+ wxCoord vSheight = 0;
- m_frameToolBar->GetSize( &nToolbarWidth
- ,&nToolbarHeight
- );
-
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
- {
- nToolbarHeight = vRect.yBottom;
- }
- else
- {
- nToolbarWidth = vRect.xRight;
- }
+ if (m_frameStatusBar)
+ m_frameStatusBar->GetSize( &vSwidth
+ ,&vSheight
+ );
+ vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
+ pToolBar->SetSize( vRect.xLeft - vRect.xLeft
+ ,vPos.y
+ ,vTWidth
+ ,vHeight - vSheight
+ );
+ }
+ else
+ {
+ wxCoord vSwidth = 0;
+ wxCoord vSheight = 0;
- //
- // Use the 'real' PM position here
- //
- GetToolBar()->SetSize( 0
- ,0
- ,nToolbarWidth
- ,nToolbarHeight
- ,wxSIZE_NO_ADJUSTMENTS
- );
+ if (m_frameStatusBar)
+ m_frameStatusBar->GetSize( &vSwidth
+ ,&vSheight
+ );
+ vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
+ pToolBar->SetSize( vRect.xRight - vFRect.xLeft - vTWidth
+ ,vPos.y
+ ,vTWidth
+ ,vHeight - vSheight
+ );
}
+ if( ::WinIsWindowShowing(m_hFrame) )
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
} // end of wxFrame::PositionToolBar
#endif // wxUSE_TOOLBAR
// Windows behaviour where child frames float independently of the parent one
// on the desktop, but are iconized/restored with it
//
-void wxFrame::IconizeChildFrames(
- bool bIconize
-)
+void wxFrame::IconizeChildFrames( bool WXUNUSED(bIconize) )
{
+ // FIXME: Generic MDI does not use Frames for the Childs, so this does _not_
+ // work. Possibly, the right thing is simply to eliminate this
+ // functions and all the calls to it from within this file.
+#if 0
for (wxWindowList::Node* pNode = GetChildren().GetFirst();
pNode;
pNode = pNode->GetNext() )
pFrame->Iconize(bIconize);
}
}
+#endif
} // end of wxFrame::IconizeChildFrames
WXHICON wxFrame::GetDefaultIcon() const
// ---------------------------------------------------------------------------
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::OS2TranslateMessage(
- WXMSG* pMsg
-)
+bool wxFrame::OS2TranslateMessage( WXMSG* pMsg )
{
//
// try the menu bar accels
//
- wxMenuBar* pMenuBar = GetMenuBar();
+ wxMenuBar* pMenuBar = GetMenuBar();
if (!pMenuBar)
- return FALSE;
+ return false;
#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable();
return rAcceleratorTable.Translate(GetHWND(), pMsg);
#else
- return FALSE;
+ return false;
#endif //wxUSE_ACCEL
} // end of wxFrame::OS2TranslateMessage
// ---------------------------------------------------------------------------
bool wxFrame::HandlePaint()
{
- RECTL vRect;
+ RECTL vRect;
if (::WinQueryUpdateRect(GetHWND(), &vRect))
{
//
// Icons in PM are the same as "pointers"
//
+ const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
- if (m_icon.Ok())
+ if (vIcon.IsOk())
hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;
if (hIcon)
{
- HWND hWndClient;
RECTL vRect3;
::WinQueryWindowRect(GetHwnd(), &vRect3);
::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);
}
::WinEndPaint(hPs);
- return TRUE;
}
else
{
,&vRect
,GetBackgroundColour().GetPixel()
);
- ::WinEndPaint(hPS);
+ ::WinEndPaint(hPS);
}
}
- return TRUE;
}
}
- else
- {
- // nothing to paint - processed
- return TRUE;
- }
- return FALSE;
+
+ return true;
} // end of wxFrame::HandlePaint
-bool wxFrame::HandleSize(
- int nX
-, int nY
-, WXUINT nId
-)
+bool wxFrame::HandleSize( int nX, int nY, WXUINT nId )
{
- bool bProcessed = FALSE;
+ bool bProcessed = false;
switch (nId)
{
//
// restore all child frames too
//
- IconizeChildFrames(FALSE);
- (void)SendIconizeEvent(FALSE);
+ IconizeChildFrames(false);
+ (void)SendIconizeEvent(false);
//
// fall through
//
case kSizeMax:
- m_bIconized = FALSE;
+ m_bIconized = false;
break;
case kSizeMin:
//
// Iconize all child frames too
//
- IconizeChildFrames(TRUE);
+ IconizeChildFrames(true);
(void)SendIconizeEvent();
- m_bIconized = TRUE;
+ m_bIconized = true;
break;
}
PositionToolBar();
#endif // wxUSE_TOOLBAR
- wxSizeEvent vEvent( wxSize( nX
- ,nY
- )
- ,m_windowId
- );
-
- vEvent.SetEventObject(this);
- bProcessed = GetEventHandler()->ProcessEvent(vEvent);
- AlterChildPos();
+ bProcessed = wxWindow::HandleSize( nX
+ ,nY
+ ,nId
+ );
}
return bProcessed;
} // end of wxFrame::HandleSize
-bool wxFrame::HandleCommand(
- WXWORD nId
-, WXWORD nCmd
-, WXHWND hControl
-)
+bool wxFrame::HandleCommand( WXWORD nId,
+ WXWORD nCmd,
+ WXHWND hControl )
{
if (hControl)
{
wxWindow* pWin = wxFindWinFromHandle(hControl);
if (pWin)
- return pWin->OS2Command( nCmd
- ,nId
- );
+ return pWin->OS2Command( nCmd, nId );
}
//
wxCurrentPopupMenu = NULL;
- return pPopupMenu->OS2Command( nCmd
- ,nId
- );
- return TRUE;
+ return pPopupMenu->OS2Command( nCmd, nId );
}
#endif
if (ProcessCommand(nId))
{
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
} // end of wxFrame::HandleCommand
-bool wxFrame::HandleMenuSelect(
- WXWORD nItem
-, WXWORD nFlags
-, WXHMENU hMenu
-)
+bool wxFrame::HandleMenuSelect( WXWORD nItem,
+ WXWORD nFlags,
+ WXHMENU hMenu )
{
if( !nFlags )
{
wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
vEvent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM
+ HandleWindowEvent(vEvent); // return value would be ignored by PM
+ }
+ else
+ {
+ DoGiveHelp(wxEmptyString, true);
+ return false;
}
}
- return TRUE;
+ return true;
} // end of wxFrame::HandleMenuSelect
// ---------------------------------------------------------------------------
// Main Frame window proc
// ---------------------------------------------------------------------------
-MRESULT EXPENTRY wxFrameMainWndProc(
- HWND hWnd
-, ULONG ulMsg
-, MPARAM wParam
-, MPARAM lParam
-)
+MRESULT EXPENTRY wxFrameMainWndProc( HWND hWnd,
+ ULONG ulMsg,
+ MPARAM wParam,
+ MPARAM lParam )
{
- MRESULT rc = (MRESULT)0;
- bool bProcessed = FALSE;
- wxFrame* pWnd = NULL;
+ MRESULT rc = (MRESULT)0;
+ bool bProcessed = false;
+ wxFrame* pWnd = NULL;
pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
switch (ulMsg)
int nItemCount;
int i;
PSWP pSWP = NULL;
- SWP vSwpStb;
RECTL vRectl;
RECTL vRstb;
- int nHeight=0;
+ RECTL vRtlb;
+ int nHeight = 0;
+ int nHeight2 = 0;
+ int nWidth = 0;
pSWP = (PSWP)PVOIDFROMMP(wParam);
nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
{
::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb);
pWnd->m_frameStatusBar->GetSize(NULL, &nHeight);
- ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
- ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
- vRstb = vRectl;
- ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
-
- vSwpStb.x = vRectl.xLeft - vRstb.xLeft;
- vSwpStb.y = vRectl.yBottom - vRstb.yBottom;
- vSwpStb.cx = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ??
- vSwpStb.cy = nHeight;
- vSwpStb.fl = SWP_SIZE |SWP_MOVE | SWP_SHOW;
- vSwpStb.hwnd = pWnd->m_frameStatusBar->GetHWND();
- vSwpStb.hwndInsertBehind = HWND_TOP;
+ }
+ if(pWnd->m_frameToolBar)
+ {
+ ::WinQueryWindowRect(pWnd->m_frameToolBar->GetHWND(), &vRtlb);
+ pWnd->m_frameToolBar->GetSize(&nWidth, &nHeight2);
}
::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
{
if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
{
- pSWP[i].x = vRectl.xLeft;
- pSWP[i].y = vRectl.yBottom + nHeight;
- pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
- pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
+ if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_TOP)
+ {
+ pSWP[i].x = vRectl.xLeft;
+ pSWP[i].y = vRectl.yBottom + nHeight;
+ pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
+ pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
+ }
+ else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
+ {
+ pSWP[i].x = vRectl.xLeft;
+ pSWP[i].y = vRectl.yBottom + nHeight + nHeight2;
+ pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
+ pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
+ }
+ else if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_LEFT)
+ {
+ pSWP[i].x = vRectl.xLeft + nWidth;
+ pSWP[i].y = vRectl.yBottom + nHeight;
+ pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth);
+ pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
+ }
+ else
+ {
+ pSWP[i].x = vRectl.xLeft;
+ pSWP[i].y = vRectl.yBottom + nHeight;
+ pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth);
+ pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
+ }
pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
pSWP[i].hwndInsertBehind = HWND_TOP;
}
}
- bProcessed = TRUE;
+ bProcessed = true;
rc = MRFROMSHORT(nItemCount);
}
break;
//
MRESULT rc = (MRESULT)0;
- bool bProcessed = FALSE;
//
// Stop right here if we don't have a valid handle in our wxWindow object.
return rc;
} // end of wxFrameWndProc
-MRESULT wxFrame::OS2WindowProc(
- WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+MRESULT wxFrame::OS2WindowProc( WXUINT uMessage,
+ WXWPARAM wParam,
+ WXLPARAM lParam )
{
- MRESULT mRc = 0L;
- bool bProcessed = FALSE;
+ MRESULT mRc = 0L;
+ bool bProcessed = false;
switch (uMessage)
{
case WM_SIZE:
{
- SHORT nScxold = SHORT1FROMMP(wParam); // Old horizontal size.
- SHORT nScyold = SHORT2FROMMP(wParam); // Old vertical size.
SHORT nScxnew = SHORT1FROMMP(lParam); // New horizontal size.
SHORT nScynew = SHORT2FROMMP(lParam); // New vertical size.
case CM_QUERYDRAGIMAGE:
{
+ const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
- if (m_icon.Ok())
+ if (vIcon.IsOk())
hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
else
hIcon = (HPOINTER)m_hDefaultIcon;
return (MRESULT)mRc;
} // wxFrame::OS2WindowProc
-void wxFrame::SetClient(WXHWND c_Hwnd)
+void wxFrame::SetClient(WXHWND WXUNUSED(c_Hwnd))
{
// Duh...nothing to do under OS/2
}
-void wxFrame::SetClient(
- wxWindow* pWindow
-)
+void wxFrame::SetClient( wxWindow* pWindow )
{
- wxWindow* pOldClient = this->GetClient();
- bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
+ wxWindow* pOldClient = this->GetClient();
+ bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
if(pOldClient == pWindow) // nothing to do
return;
if(bClientHasFocus )
this->SetFocus();
- pOldClient->Enable( FALSE );
- pOldClient->Show( FALSE );
+ pOldClient->Enable( false );
+ pOldClient->Show( false );
::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
// to avoid OS/2 bug need to update frame
::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);
::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
if(pOldClient)
{
- pOldClient->Enable(FALSE);
- pOldClient->Show(FALSE);
+ pOldClient->Enable(false);
+ pOldClient->Show(false);
::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
}
pWindow->Reparent(this);
{
return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
}
+
projects / wxWidgets.git / blobdiff