#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/hash.h"
+ #include "wx/string.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"
extern wxChar wxFrameClassName[];
extern wxMenu *wxCurrentPopupMenu;
+extern void wxAssociateWinWithHandle( HWND hWnd
+ ,wxWindow* pWin
+ );
+
// ----------------------------------------------------------------------------
// event tables
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// static class members
// ----------------------------------------------------------------------------
+#if wxUSE_STATUSBAR
#if wxUSE_NATIVE_STATUSBAR
bool wxFrame::m_bUseNativeStatusBar = TRUE;
bool wxFrame::m_bUseNativeStatusBar = FALSE;
#endif
+#endif //wxUSE_STATUSBAR
+
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
m_nFsToolBarHeight = 0;
m_bFsIsMaximized = FALSE;
m_bFsIsShowing = FALSE;
+ m_bIsShown = FALSE;
+ m_pWinLastFocused = (wxWindow *)NULL;
+
+ m_hFrame = NULL;
+ m_hTitleBar = NULL;
+ m_hHScroll = NULL;
+ m_hVScroll = NULL;
//
// Initialize SWP's
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
+ bool bOk = FALSE;
SetName(rsName);
m_windowStyle = lulStyle;
m_frameMenuBar = NULL;
+#if wxUSE_TOOLBAR
m_frameToolBar = NULL;
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
m_frameStatusBar = NULL;
+#endif //wxUSE_STATUSBAR
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
pParent = NULL;
- if (!pParent)
- wxTopLevelWindows.Append(this);
-
- OS2Create( m_windowId
- ,pParent
- ,wxFrameClassName
- ,this
- ,rsTitle
- ,nX
- ,nY
- ,nWidth
- ,nHeight
- ,lulStyle
- );
-
- wxModelessWindows.Append(this);
- return TRUE;
+ bOk = OS2Create( m_windowId
+ ,pParent
+ ,wxFrameClassName
+ ,this
+ ,rsTitle
+ ,nX
+ ,nY
+ ,nWidth
+ ,nHeight
+ ,lulStyle
+ );
+ if (bOk)
+ {
+ if (!pParent)
+ wxTopLevelWindows.Append(this);
+ wxModelessWindows.Append(this);
+ }
+ return(bOk);
} // end of wxFrame::Create
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);
//
, int* pY
) const
{
- //
- // OS/2 PM's coordinates go from bottom-left not
- // top-left thus the += instead of the -=
- //
RECTL vRect;
+ ::WinQueryWindowRect(GetHwnd(), &vRect);
//
- // PM has no GetClientRect that inherantly knows about the client window
- // We have to explicitly go fetch it!
+ // No need to use statusbar code as in WIN32 as the FORMATFRAME
+ // window procedure ensures PM knows about the new frame client
+ // size internally. A ::WinQueryWindowRect is all that is needed!
//
- ::WinQueryWindowRect(GetHwnd(), &vRect);
-
-#if wxUSE_STATUSBAR
- if ( GetStatusBar() )
- {
- int nStatusX;
- int nStatusY;
-
- GetStatusBar()->GetClientSize( &nStatusX
- ,&nStatusY
- );
- vRect.yBottom += nStatusY;
- }
-#endif // wxUSE_STATUSBAR
-
- wxPoint vPoint(GetClientAreaOrigin());
-
- vRect.yBottom += vPoint.y;
- vRect.xRight -= vPoint.x;
if (pX)
- *pX = vRect.xRight;
+ *pX = vRect.xRight - vRect.xLeft;
if (pY)
- *pY = vRect.yBottom;
+ *pY = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetClientSize
//
RECTL vRect2;
::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
POINTL vPoint;
::WinQueryWindowRect(m_hFrame, &vRect);
- vPoint.x = vRect.xLeft;
-
- //
- // OS/2 is backwards [WIN32 it is vRect.yTop]
- //
- vPoint.y = vRect.yBottom;
- *pX = vPoint.x;
- *pY = vPoint.y;
+ *pX = vRect.xRight - vRect.xLeft;
+ *pY = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetPosition
// ----------------------------------------------------------------------------
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);
+ m_bIconized = bShowCmd == SWP_MINIMIZE;
} // end of wxFrame::DoShowWindow
bool wxFrame::Show(
::WinQueryWindowPos(m_hFrame, &vSwp);
m_bIconized = vSwp.fl & SWP_MINIMIZE;
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
::WinEnableWindow(m_hFrame, TRUE);
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
bool wxFrame::IsIconized() const
{
SWP vSwp;
- bool bIconic;
- ::WinQueryWindowPos(GetHwnd(), &vSwp);
+ ::WinQueryWindowPos(m_hFrame, &vSwp);
if (vSwp.fl & SWP_MINIMIZE)
((wxFrame*)this)->m_bIconized = TRUE;
)
{
wxStatusBar* pStatusBar = NULL;
+ SWP vSwp;
+ ERRORID vError;
+ wxString sError;
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
,lulStyle
,vId
,rName
- );
+ );
+
+ if( !pStatusBar )
+ return NULL;
+
+ ::WinSetParent( pStatusBar->GetHWND()
+ ,m_hFrame
+ ,FALSE
+ );
+ ::WinSetOwner( pStatusBar->GetHWND()
+ ,m_hFrame
+ );
+ //
+ // to show statusbar
+ //
+ if(::WinIsWindowShowing(m_hFrame))
+ ::WinSendMsg(m_hFrame, 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
//
if (m_frameStatusBar)
{
int nWidth;
- int nHeight;
int nStatbarWidth;
int nStatbarHeight;
HWND hWndClient;
RECTL vRect;
+ RECTL vFRect;
- ::WinQueryWindowRect(GetHwnd(), &vRect);
+ ::WinQueryWindowRect(m_hFrame, &vRect);
+ ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+ vFRect = vRect;
+ ::WinCalcFrameRect(m_hFrame, &vRect, TRUE);
nWidth = vRect.xRight - vRect.xLeft;
- nHeight = vRect.yTop - vRect.yBottom;
m_frameStatusBar->GetSize( &nStatbarWidth
,&nStatbarHeight
// Since we wish the status bar to be directly under the client area,
// we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
//
- m_frameStatusBar->SetSize( 0
- ,nHeight
+ m_frameStatusBar->SetSize( vRect.xLeft - vFRect.xLeft
+ ,vRect.yBottom - vFRect.yBottom
,nWidth
,nStatbarHeight
);
+ if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error setting parent for StautsBar. Error: %s\n", sError);
+ return;
+ }
}
} // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR
{
ERRORID vError;
wxString sError;
- HWND hClient = NULLHANDLE;
- HWND hFrame = NULLHANDLE;
HWND hTitlebar = NULLHANDLE;
HWND hHScroll = NULLHANDLE;
HWND hVScroll = NULLHANDLE;
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();
+ //
+ // Actually remove the menu from the frame
+ //
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
}
- else
+ else // set new non NULL menu bar
{
- pMenuBar->Detach();
-
- m_hMenu = pMenuBar->Create();
+ m_frameMenuBar = NULL;
- if (!m_hMenu)
- return;
+ //
+ // 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);
}
+} // end of wxFrame::SetMenuBar
+void wxFrame::InternalSetMenuBar()
+{
+ ERRORID vError;
+ wxString sError;
//
// Set the parent and owner of the menubar to be the frame
//
sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError);
}
- 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(hTitlebar, &vSwpTitlebar);
- hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
- WinQueryWindowPos(hHScroll, &vSwpHScroll);
- hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
- WinQueryWindowPos(hVScroll, &vSwpVScroll);
- hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
- WinQueryWindowPos(hMenuBar, &vSwpMenu);
- WinSetWindowPos( GetHwnd()
- ,HWND_TOP
- ,SV_CXSIZEBORDER/2
- ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
- ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx)
- ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy/2)
- ,SWP_SIZE | SWP_MOVE
- );
-} // end of wxFrame::SetMenuBar
-
-void wxFrame::InternalSetMenuBar()
-{
- WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar
//
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
+#if wxUSE_STATUSBAR
if (m_frameStatusBar)
{
wxSysColourChangedEvent vEvent2;
vEvent2.SetEventObject(m_frameStatusBar);
m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
}
+#endif //wxUSE_STATUSBAR
//
// Propagate the event to the non-top-level children
, 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();
+#if wxUSE_TOOLBAR
+ wxToolBar* pTheToolBar = GetToolBar();
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+ wxStatusBar* pTheStatusBar = GetStatusBar();
+#endif //wxUSE_STATUSBAR
- int dummyWidth;
+ int nDummyWidth;
- if (theToolBar)
- theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
- if (theStatusBar)
- theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+#if wxUSE_TOOLBAR
+ if (pTheToolBar)
+ pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+#endif //wxUSE_TOOLBAR
- // zap the toolbar, menubar, and statusbar
+#if wxUSE_STATUSBAR
+ if (pTheStatusBar)
+ pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
+#endif //wxUSE_STATUSBAR
- if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+#if wxUSE_TOOLBAR
+ //
+ // 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);
}
+#endif //wxUSE_TOOLBAR
- if (style & wxFULLSCREEN_NOMENUBAR)
- SetMenu((HWND)GetHWND(), (HMENU) NULL);
+ if (lStyle & wxFULLSCREEN_NOMENUBAR)
+ {
+ ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+ ::WinSetOwner(m_hMenu, m_hFrame);
+ ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ }
+#if wxUSE_STATUSBAR
+ //
// 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;
+#endif //wxUSE_STATUSBAR
- // 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(m_hFrame, 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)m_hFrame, 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();
+#if wxUSE_TOOLBAR
+ 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);
}
+#endif //wxUSE_TOOLBAR
- if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+#if wxUSE_STATUSBAR
+ if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
{
- CreateStatusBar(m_fsStatusBarFields);
- PositionStatusBar();
+ CreateStatusBar(m_nFsStatusBarFields);
+// PositionStatusBar();
}
+#endif //wxUSE_STATUSBAR
- 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, m_hFrame, FALSE);
+ ::WinSetOwner(m_hMenu, m_hFrame);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ }
+ Maximize(m_bFsIsMaximized);
+
+ ::WinSetWindowULong( m_hFrame
+ ,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
//
ULONG ulExtraFlags = 0L;
FRAMECDATA vFrameCtlData;
HWND hParent = NULLHANDLE;
- HWND hClient = NULLHANDLE;
- HWND hFrame = NULLHANDLE;
HWND hTitlebar = NULLHANDLE;
HWND hHScroll = NULLHANDLE;
HWND hVScroll = NULLHANDLE;
+ HWND hFrame = NULLHANDLE;
+ HWND hClient = NULLHANDLE;
SWP vSwp[10];
RECTL vRect[10];
USHORT uCtlCount;
+ ERRORID vError;
+ wxString sError;
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)
vFrameCtlData.idResources = 0;
//
- // Create the frame window
+ // Create the frame window: We break ranks with other ports now
+ // and instead of calling down into the base wxWindow class' OS2Create
+ // we do all our own stuff here. We will set the needed pieces
+ // of wxWindow manually, here.
//
- 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)&vFrameCtlData // Creation data
- ,NULL // Window Pres Params
- )) == 0L)
+
+ hFrame = ::WinCreateStdWindow( hParent
+ ,ulStyleFlags // frame-window style
+ ,&ulCreateFlags // window style
+ ,(PSZ)zWclass // class name
+ ,(PSZ)zTitle // window title
+ ,0L // default client style
+ ,NULLHANDLE // resource in executable file
+ ,0 // resource id
+ ,&hClient // receives client window handle
+ );
+ if (!hFrame)
{
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error creating frame. Error: %s\n", sError);
return FALSE;
}
- if (!wxWindow::OS2Create( m_hFrame
- ,wxFrameClassName
- ,NULL
- ,0L
- ,0L
- ,0L
- ,0L
- ,0L
- ,NULLHANDLE
- ,HWND_TOP
- ,(unsigned long)FID_CLIENT
- ,NULL
- ,NULL
- ))
+ //
+ // wxWindow class' m_hWnd set here and needed associations
+ //
+ m_hFrame = hFrame;
+ m_hWnd = hClient;
+ wxAssociateWinWithHandle(m_hWnd, this);
+ wxAssociateWinWithHandle(m_hFrame, this);
+
+ m_backgroundColour.Set(wxString("GREY"));
+
+ LONG lColor = (LONG)m_backgroundColour.GetPixel();
+
+ if (!::WinSetPresParam( m_hWnd
+ ,PP_BACKGROUNDCOLOR
+ ,sizeof(LONG)
+ ,(PVOID)&lColor
+ ))
{
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error creating frame. Error: %s\n", sError);
return FALSE;
}
+ //
+ // Now need to subclass window. Instead of calling the SubClassWin in wxWindow
+ // we manually subclass here because we don't want to use the main wxWndProc
+ // by default
+ //
+ m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc);
+
//
// Now size everything. If adding a menu the client will need to be resized.
//
+
if (!::WinSetWindowPos( m_hFrame
,HWND_TOP
,nX
,nY
,nWidth
,nHeight
- ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
+ ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
))
- return FALSE;
-
- uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
- for (int i = 0; i < uCtlCount; i++)
{
- if (vSwp[i].hwnd == m_hFrame)
- 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));
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error sizing frame. Error: %s\n", sError);
+ return FALSE;
}
-
//
- // 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!
+ // We may have to be smarter here when variable sized toolbars are added!
//
+ if (!::WinSetWindowPos( m_hWnd
+ ,HWND_TOP
+ ,nX // + 20
+ ,nY // + 20
+ ,nWidth // - 60
+ ,nHeight // - 60
+ ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+ ))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error sizing client. Error: %s\n", sError);
+ return FALSE;
+ }
return TRUE;
} // end of wxFrame::OS2Create
wxActivateEvent& rEvent
)
{
- for (wxWindowList::Node* pNode = GetChildren().GetFirst();
- pNode;
- pNode = pNode->GetNext())
+ if ( rEvent.GetActive() )
{
- // 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 to the child which was last focused
+ wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
- // restore focus
- wxWindow* pChild = pNode->GetData();
+ wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
+ : NULL;
+ if (!pParent)
+ {
+ pParent = this;
+ }
- if (!pChild->IsTopLevel()
+ 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)
+ && !wxDynamicCast(pChild, wxToolBar)
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
- && !wxDynamicCast(pChild, wxStatusBar)
+ && !wxDynamicCast(pChild, wxStatusBar)
#endif // wxUSE_STATUSBAR
- )
- {
- pChild->SetFocus();
- return;
+ )
+ {
+ pChild->SetFocus();
+ return;
+ }
}
}
} // end of wxFrame::OnActivate
{
wxPoint vPoint(0, 0);
+#if wxUSE_TOOLBAR
if (GetToolBar())
{
int nWidth;
vPoint.y += nHeight;
}
}
+#endif //wxUSE_TOOLBAR
return vPoint;
} // end of wxFrame::GetClientAreaOrigin
}
#endif // wxUSE_STATUSBAR
- if ( GetToolBar() )
+ if ( m_frameToolBar )
{
int nToolbarWidth;
int nToolbarHeight;
- GetToolBar()->GetSize( &nToolbarWidth
+ m_frameToolBar->GetSize( &nToolbarWidth
,&nToolbarHeight
);
WXMSG* pMsg
)
{
- if (wxWindow::OS2TranslateMessage(pMsg))
- return TRUE;
//
// try the menu bar accels
//
if (!pMenuBar )
return FALSE;
+#if wxUSE_ACCEL
const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable();
- return rAcceleratorTable.Translate(this, pMsg);
+ return rAcceleratorTable.Translate(GetHWND(), pMsg);
+#else
+ return FALSE;
+#endif //wxUSE_ACCEL
} // end of wxFrame::OS2TranslateMessage
// ---------------------------------------------------------------------------
{
RECTL vRect;
- if (::WinQueryUpdateRect(m_hFrame, &vRect))
+ if (::WinQueryUpdateRect(GetHWND(), &vRect))
{
if (m_bIconized)
{
// 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
{
- return wxWindow::HandlePaint();
+ return(wxWindow::HandlePaint());
}
}
else
// restore all child frames too
//
IconizeChildFrames(FALSE);
+ (void)SendIconizeEvent(FALSE);
//
// fall through
// Iconize all child frames too
//
IconizeChildFrames(TRUE);
+ (void)SendIconizeEvent();
m_bIconized = TRUE;
break;
}
#endif // wxUSE_NATIVE_STATUSBAR
PositionStatusBar();
+#if wxUSE_TOOLBAR
PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
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;
+ if( !nFlags )
+ {
+ MENUITEM mItem;
+ MRESULT rc;
- if (nFlags == 0xFFFF && hMenu == 0)
+ 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
+
+// ---------------------------------------------------------------------------
+// Main Frame window proc
+// ---------------------------------------------------------------------------
+MRESULT EXPENTRY wxFrameMainWndProc(
+ HWND hWnd
+, ULONG ulMsg
+, MPARAM wParam
+, MPARAM lParam
+)
+{
+ MRESULT rc = (MRESULT)0;
+ bool bProcessed = FALSE;
+ wxFrame* pWnd = NULL;
+
+ pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+ switch (ulMsg)
{
- //
- // Menu was removed from screen
- //
- nMenuItem = -1;
+ case WM_QUERYFRAMECTLCOUNT:
+ if(pWnd && pWnd->m_fnOldWndProc)
+ {
+ USHORT uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+
+ rc = MRFROMSHORT(uItemCount);
+ }
+ break;
+
+ case WM_FORMATFRAME:
+/////////////////////////////////////////////////////////////////////////////////
+// Applications that subclass frame controls may find that the frame is already
+// subclassed the number of frame controls is variable.
+// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be
+// subclassed by calling the previous window procedure and modifying its result.
+////////////////////////////////////////////////////////////////////////////////
+ {
+ int nItemCount;
+ int i;
+ PSWP pSWP = NULL;
+ SWP vSwpStb;
+ RECTL vRectl;
+ RECTL vRstb;
+ int nHeight=0;
+
+ pSWP = (PSWP)PVOIDFROMMP(wParam);
+ nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+ if(pWnd->m_frameStatusBar)
+ {
+ ::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;
+ }
+ ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
+ ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
+ ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
+ ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2);
+ for(i = 0; i < nItemCount; i++)
+ {
+ 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;
+ pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+ pSWP[i].hwndInsertBehind = HWND_TOP;
+ }
+ }
+ bProcessed = TRUE;
+ rc = MRFROMSHORT(nItemCount);
+ }
+ break;
+
+ default:
+ if(pWnd && pWnd->m_fnOldWndProc)
+ rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam);
+ else
+ rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
}
- else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR))
+ return rc;
+} // end of wxFrameMainWndProc
+
+MRESULT EXPENTRY wxFrameWndProc(
+ HWND hWnd
+, ULONG ulMsg
+, MPARAM wParam
+, MPARAM lParam
+)
+{
+ //
+ // Trace all ulMsgs - useful for the debugging
+ //
+ HWND parentHwnd;
+ wxFrame* pWnd = NULL;
+
+ parentHwnd = WinQueryWindow(hWnd,QW_PARENT);
+ pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+
+ //
+ // When we get the first message for the HWND we just created, we associate
+ // it with wxWindow stored in wxWndHook
+ //
+
+ MRESULT rc = (MRESULT)0;
+ bool bProcessed = FALSE;
+
+ //
+ // Stop right here if we don't have a valid handle in our wxWindow object.
+ //
+ if (pWnd && !pWnd->GetHWND())
{
- nMenuItem = nItem;
+ pWnd->SetHWND((WXHWND) hWnd);
+ rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam );
+ pWnd->SetHWND(0);
}
else
{
- //
- // Don't give hints for separators (doesn't make sense) nor for the
- // items opening popup menus (they don't have them anyhow)
- //
- return FALSE;
+ if (pWnd)
+ rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+ else
+ rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
}
- wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem);
-
- vEvent.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxFrame::HandleMenuSelect
-
-// ---------------------------------------------------------------------------
-// the window proc for wxFrame
-// ---------------------------------------------------------------------------
+ return rc;
+} // end of wxFrameWndProc
MRESULT wxFrame::OS2WindowProc(
WXUINT uMessage
bProcessed = !Close();
break;
- case WM_COMMAND:
+ case WM_PAINT:
+ bProcessed = HandlePaint();
+ mRc = (MRESULT)FALSE;
+ break;
+
+ case WM_ERASEBACKGROUND:
+ //
+ // Returning TRUE to requests PM to paint the window background
+ // in SYSCLR_WINDOW. We capture this here because the PS returned
+ // in Frames is the PS for the whole frame, which we can't really
+ // use at all. If you want to paint a different background, do it
+ // in an OnPaint using a wxPaintDC.
+ //
+ mRc = (MRESULT)(TRUE);
+ break;
+
+ case WM_COMMAND:
{
WORD wId;
WORD wCmd;
,&hWnd
,&wCmd
);
+
bProcessed = HandleCommand( wId
,wCmd
,(WXHWND)hWnd
,wFlags
,hMenu
);
+ mRc = (MRESULT)TRUE;
}
break;
- case WM_PAINT:
- bProcessed = HandlePaint();
- break;
+ 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 WM_ERASEBACKGROUND:
- //
- // Return TRUE to request PM to paint the window background
- // in SYSCLR_WINDOW.
- //
- bProcessed = TRUE;
- mRc = (MRESULT)(TRUE);
+ lParam = MRFROM2SHORT( nScxnew - 20
+ ,nScynew - 30
+ );
+ }
+ bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+ mRc = (MRESULT)FALSE;
break;
case CM_QUERYDRAGIMAGE:
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;
bProcessed = mRc != 0;
}
break;
-
- case WM_SIZE:
- bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
- break;
}
if (!bProcessed )
,wParam
,lParam
);
- return (MRESULT)0;
+ return (MRESULT)mRc;
} // wxFrame::OS2WindowProc
+void wxFrame::SetClient(WXHWND c_Hwnd)
+{
+ // Duh...nothing to do under OS/2
+}
+
+void wxFrame::SetClient(
+ wxWindow* pWindow
+)
+{
+ wxWindow* pOldClient = this->GetClient();
+ bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
+
+ if(pOldClient == pWindow) // nothing to do
+ return;
+ if(pWindow == NULL) // just need to remove old client
+ {
+ if(pOldClient == NULL) // nothing to do
+ return;
+
+ if(bClientHasFocus )
+ this->SetFocus();
+
+ 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);
+ return;
+ }
+
+ //
+ // Else need to change client
+ //
+ if(bClientHasFocus)
+ this->SetFocus();
+
+ ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
+ if(pOldClient)
+ {
+ pOldClient->Enable(FALSE);
+ pOldClient->Show(FALSE);
+ ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
+ }
+ pWindow->Reparent(this);
+ ::WinSetWindowUShort(pWindow->GetHWND(), QWS_ID, FID_CLIENT);
+ ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE);
+ pWindow->Enable();
+ pWindow->Show(); // ensure client is showing
+ if( this->IsShown() )
+ {
+ this->Show();
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+ }
+}
+
+wxWindow* wxFrame::GetClient()
+{
+ return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
+}
projects / wxWidgets.git / blobdiff