/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
+// Name: src/os2/frame.cpp
// Purpose: wxFrame
// Author: David Webster
// Modified by:
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
- #include "wx/setup.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/frame.h"
#include "wx/menu.h"
#include "wx/app.h"
#include "wx/dialog.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;
-extern wxChar wxFrameClassName[];
+#if wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu;
+#endif
// ----------------------------------------------------------------------------
// event tables
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
- EVT_ACTIVATE(wxFrame::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// static class members
// ----------------------------------------------------------------------------
+#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
+
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
void wxFrame::Init()
{
- m_bIconized = FALSE;
-
-#if wxUSE_TOOLTIPS
- m_hWndToolTip = 0;
-#endif
- // Data to save/restore when calling ShowFullScreen
- m_lFsStyle = 0L;
- m_lFsOldWindowStyle = 0L;
m_nFsStatusBarFields = 0;
m_nFsStatusBarHeight = 0;
m_nFsToolBarHeight = 0;
- m_bFsIsMaximized = FALSE;
- m_bFsIsShowing = FALSE;
+ m_hWndToolTip = 0L;
+ m_bWasMinimized = false;
+
+
+ m_frameMenuBar = NULL;
+ m_frameToolBar = NULL;
+ m_frameStatusBar = NULL;
+
+ m_hTitleBar = NULLHANDLE;
+ m_hHScroll = NULLHANDLE;
+ m_hVScroll = NULLHANDLE;
//
// Initialize SWP's
//
- memset(&m_vSwp, 0, sizeof(SWP));
- memset(&m_vSwpClient, 0, sizeof(SWP));
memset(&m_vSwpTitleBar, 0, sizeof(SWP));
memset(&m_vSwpMenuBar, 0, sizeof(SWP));
memset(&m_vSwpHScroll, 0, sizeof(SWP));
memset(&m_vSwpVScroll, 0, sizeof(SWP));
memset(&m_vSwpStatusBar, 0, sizeof(SWP));
memset(&m_vSwpToolBar, 0, sizeof(SWP));
+ m_bIconized = false;
+
} // end of wxFrame::Init
-bool wxFrame::Create(
- wxWindow* pParent
-, wxWindowID vId
-, const wxString& rsTitle
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lulStyle
-, const wxString& rsName
-)
+bool wxFrame::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxString& rsTitle,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxString& rsName )
{
- int nX = rPos.x;
- int nY = rPos.y;
- int nWidth = rSize.x;
- int nHeight = rSize.y;
-
- SetName(rsName);
- m_windowStyle = lulStyle;
- m_frameMenuBar = NULL;
- m_frameToolBar = NULL;
- m_frameStatusBar = NULL;
-
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
- if (vId > -1 )
- m_windowId = vId;
- else
- m_windowId = (int)NewControlId();
-
- if (pParent)
- pParent->AddChild(this);
-
- m_bIconized = FALSE;
-
- 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;
+ if (!wxTopLevelWindow::Create( pParent
+ ,vId
+ ,rsTitle
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rsName
+ ))
+ return false;
+ return true;
} // end of wxFrame::Create
wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
- wxTopLevelWindows.DeleteObject(this);
-
+ m_isBeingDeleted = true;
DeleteAllBars();
-
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0);
- }
- }
- wxModelessWindows.DeleteObject(this);
-
- //
- // For some reason, wxWindows can activate another task altogether
- // when a frame is destroyed after a modal dialog has been invoked.
- // Try to bring the parent to the top.
- //
- // MT:Only do this if this frame is currently the active window, else weird
- // things start to happen.
- //
- if (wxGetActiveWindow() == this)
- {
- if (GetParent() && GetParent()->GetHWND())
- {
- ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
- ,HWND_TOP
- ,0
- ,0
- ,0
- ,0
- ,SWP_ZORDER
- );
- }
- }
} // end of wxFrame::~wxFrame
//
, int* pY
) const
{
+ wxTopLevelWindow::DoGetClientSize( pX
+ ,pY
+ );
//
- // OS/2 PM's coordinates go from bottom-left not
- // top-left thus the += instead of the -=
- //
- RECTL 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 (that is called in
+ // wxWindow's GetClient size from above) 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;
- if (pY)
- *pY = vRect.yBottom;
} // end of wxFrame::DoGetClientSize
//
// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
+// to wxWidgets)
//
void wxFrame::DoSetClientSize(
int nWidth
, int nHeight
)
{
- HWND hWnd = GetHwnd();
- RECTL vRect;
- RECTL vRect2;
-
- ::WinQueryWindowRect(GetHwnd(), &vRect);
-
- ::WinQueryWindowRect(m_hFrame, &vRect2);
-
//
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window. Remember OS/2's backwards y coord system!
+ // Statusbars are not part of the OS/2 Client but parent frame
+ // so no statusbar consideration
//
- int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
- int nActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight;
-
-#if wxUSE_STATUSBAR
- if ( GetStatusBar() )
- {
- int nStatusX;
- int nStatusY;
-
- GetStatusBar()->GetClientSize( &nStatusX
- ,&nStatusY
+ wxTopLevelWindow::DoSetClientSize( nWidth
+ ,nHeight
);
- nActualHeight += nStatusY;
- }
-#endif // wxUSE_STATUSBAR
-
- wxPoint vPoint(GetClientAreaOrigin());
- nActualWidth += vPoint.y;
- nActualHeight += vPoint.x;
-
- POINTL vPointl;
-
- vPointl.x = vRect2.xLeft;
- vPoint.y = vRect2.yTop;
-
- ::WinSetWindowPos( m_hFrame
- ,HWND_TOP
- ,vPointl.x
- ,vPointl.y
- ,nActualWidth
- ,nActualHeight
- ,SWP_MOVE | SWP_SIZE | SWP_SHOW
- );
-
- wxSizeEvent vEvent( wxSize( nWidth
- ,nHeight
- )
- ,m_windowId
- );
- vEvent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(vEvent);
} // end of wxFrame::DoSetClientSize
-void wxFrame::DoGetSize(
- int* pWidth
-, int* pHeight
-) const
-{
- RECTL vRect;
-
- ::WinQueryWindowRect(m_hFrame, &vRect);
- *pWidth = vRect.xRight - vRect.xLeft;
- *pHeight = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetSize
-
-void wxFrame::DoGetPosition(
- int* pX
-, int* pY
-) const
-{
- RECTL vRect;
- 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;
-} // end of wxFrame::DoGetPosition
-
// ----------------------------------------------------------------------------
-// variations around ::ShowWindow()
+// wxFrame: various geometry-related functions
// ----------------------------------------------------------------------------
-void wxFrame::DoShowWindow(
- int bShowCmd
-)
+void wxFrame::Raise()
{
- 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);
-} // end of wxFrame::DoShowWindow
-
-bool wxFrame::Show(
- bool bShow
-)
-{
- SWP vSwp;
-
- DoShowWindow((int)bShow);
-
- if (bShow)
- {
- wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
-
- ::WinQueryWindowPos(m_hFrame, &vSwp);
- m_bIconized = vSwp.fl & SWP_MINIMIZE;
- ::WinEnableWindow(m_hFrame, TRUE);
- vEvent.SetEventObject(this);
- GetEventHandler()->ProcessEvent(vEvent);
- }
- else
- {
- //
- // Try to highlight the correct window (the parent)
- //
- if (GetParent())
- {
- HWND hWndParent = GetHwndOf(GetParent());
-
- ::WinQueryWindowPos(hWndParent, &vSwp);
- m_bIconized = vSwp.fl & SWP_MINIMIZE;
- if (hWndParent)
- ::WinSetWindowPos( hWndParent
- ,HWND_TOP
- ,vSwp.x
- ,vSwp.y
- ,vSwp.cx
- ,vSwp.cy
- ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE
- );
- ::WinEnableWindow(hWndParent, TRUE);
- }
- }
- return TRUE;
-} // end of wxFrame::Show
-
-void wxFrame::Iconize(
- bool bIconize
-)
-{
- DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
-} // end of wxFrame::Iconize
-
-void wxFrame::Maximize(
- bool bMaximize)
-{
- DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
-} // end of wxFrame::Maximize
-
-void wxFrame::Restore()
-{
- DoShowWindow(SWP_RESTORE);
-} // end of wxFrame::Restore
-
-bool wxFrame::IsIconized() const
-{
- SWP vSwp;
- bool bIconic;
-
- ::WinQueryWindowPos(GetHwnd(), &vSwp);
-
- if (vSwp.fl & SWP_MINIMIZE)
- ((wxFrame*)this)->m_bIconized = TRUE;
- else
- ((wxFrame*)this)->m_bIconized = FALSE;
- return m_bIconized;
-} // end of wxFrame::IsIconized
-
-// Is it maximized?
-bool wxFrame::IsMaximized() const
-{
- SWP vSwp;
- bool bIconic;
-
- ::WinQueryWindowPos(m_hFrame, &vSwp);
- return (vSwp.fl & SWP_MAXIMIZE);
-} // end of wxFrame::IsMaximized
-
-void wxFrame::SetIcon(
- const wxIcon& rIcon
-)
-{
- wxFrameBase::SetIcon(rIcon);
-
- if ((m_icon.GetHICON()) != NULLHANDLE)
- {
- ::WinSendMsg( m_hFrame
- ,WM_SETICON
- ,(MPARAM)((HPOINTER)m_icon.GetHICON())
- ,NULL
- );
- ::WinSendMsg( m_hFrame
- ,WM_UPDATEFRAME
- ,(MPARAM)FCF_ICON
- ,(MPARAM)0
- );
- }
-} // end of wxFrame::SetIcon
+ wxFrameBase::Raise();
+ ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+ ,HWND_TOP
+ ,0
+ ,0
+ ,0
+ ,0
+ ,SWP_ZORDER
+ );
+}
#if wxUSE_STATUSBAR
wxStatusBar* wxFrame::OnCreateStatusBar(
)
{
wxStatusBar* pStatusBar = NULL;
+ wxString sError;
pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
,lulStyle
,vId
,rName
- );
+ );
+
+ if( !pStatusBar )
+ return NULL;
+
+ wxClientDC vDC(pStatusBar);
+ int nY;
+
+ //
+ // Set the height according to the font and the border size
+ //
+ vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason
+ vDC.GetTextExtent( wxT("X")
+ ,NULL
+ ,&nY
+ );
+
+ int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
+
+ pStatusBar->SetSize( wxDefaultCoord
+ ,wxDefaultCoord
+ ,wxDefaultCoord
+ ,nHeight
+ );
+
+ ::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 nY;
int nStatbarWidth;
int nStatbarHeight;
- HWND hWndClient;
RECTL vRect;
+ RECTL vFRect;
- ::WinQueryWindowRect(GetHwnd(), &vRect);
+ ::WinQueryWindowRect(m_hFrame, &vRect);
+ nY = vRect.yTop;
+ ::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;
+ nY = nY - (vRect.yBottom - vFRect.yBottom);
m_frameStatusBar->GetSize( &nStatbarWidth
,&nStatbarHeight
);
+ nY= nY - 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
+ ,nY
,nWidth
,nStatbarHeight
);
+ if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError(_T("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()
{
if (m_frameMenuBar)
wxMenuBar* pMenuBar
)
{
- ERRORID vError;
wxString sError;
- HWND hClient = NULLHANDLE;
- HWND hFrame = NULLHANDLE;
- HWND hTitlebar = NULLHANDLE;
- HWND hHScroll = NULLHANDLE;
- HWND hVScroll = NULLHANDLE;
- HWND hMenuBar = NULLHANDLE;
- SWP vSwp;
- SWP vSwpTitlebar;
- SWP vSwpVScroll;
- SWP vSwpHScroll;
- SWP vSwpMenu;
if (!pMenuBar)
{
DetachMenuBar();
- return;
+
+ //
+ // Actually remove the menu from the frame
+ //
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
+ }
+ else // set new non NULL menu bar
+ {
+ m_frameMenuBar = NULL;
+
+ //
+ // Can set a menubar several times.
+ // TODO: how to prevent a memory leak if you have a currently-unattached
+ // menubar? wxWidgets 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((wxFrame*)this);
}
+} // end of wxFrame::SetMenuBar
+
+void wxFrame::AttachMenuBar(
+ wxMenuBar* pMenubar
+)
+{
+ wxFrameBase::AttachMenuBar(pMenubar);
- m_frameMenuBar = NULL;
+ m_frameMenuBar = 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
- // there are problems for MDI).
- if (pMenuBar->GetHMenu())
+ if (!pMenubar)
{
- 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();
+ //
+ // Can set a menubar several times.
+ //
+ if (pMenubar->GetHMenu())
+ {
+ m_hMenu = pMenubar->GetHMenu();
+ }
+ else
+ {
+ if (pMenubar->IsAttached())
+ pMenubar->Detach();
- m_hMenu = pMenuBar->Create();
+ m_hMenu = pMenubar->Create();
- if (!m_hMenu)
- return;
+ if (!m_hMenu)
+ return;
+ }
+ InternalSetMenuBar();
}
+} // end of wxFrame::AttachMenuBar
+void wxFrame::InternalSetMenuBar()
+{
+ ERRORID vError;
+ wxString sError;
//
// Set the parent and owner of the menubar to be the frame
//
{
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+ wxLogError(_T("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(_T("Error setting parent for submenu. Error: %s\n"), sError.c_str());
}
- 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
+#endif // wxUSE_MENUS_NATIVE
//
// Responds to colour changes, and passes event on to children
wxSysColourChangedEvent& rEvent
)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+ SetBackgroundColour(wxSystemSettings::GetColour(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
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 )
{
- /*
- // TODO
- if (show)
+ if (bShow)
{
if (IsFullScreen())
- return FALSE;
+ 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(wxDefaultCoord,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;
+ //
+ // Remember 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
+ );
+
+ wxSize sz( nWidth, nHeight );
+ wxSizeEvent vEvent( sz, GetId() );
- return TRUE;
+ GetEventHandler()->ProcessEvent(vEvent);
+ return true;
}
else
{
if (!IsFullScreen())
- return FALSE;
+ 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(wxDefaultCoord, 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);
-
- return TRUE;
- }
-*/
- return TRUE;
-} // end of wxFrame::ShowFullScreen
-
-//
-// Frame window
-//
-bool wxFrame::OS2Create(
- int nId
-, wxWindow* pParent
-, const wxChar* zWclass
-, wxWindow* pWxWin
-, const wxChar* zTitle
-, int nX
-, int nY
-, int nWidth
-, int nHeight
-, long ulStyle
-)
-{
- ULONG ulCreateFlags = 0L;
- ULONG ulStyleFlags = 0L;
- ULONG ulExtraFlags = 0L;
- FRAMECDATA vFrameCtlData;
- HWND hParent = NULLHANDLE;
- HWND hClient = NULLHANDLE;
- HWND hFrame = NULLHANDLE;
- HWND hTitlebar = NULLHANDLE;
- HWND hHScroll = NULLHANDLE;
- HWND hVScroll = NULLHANDLE;
- SWP vSwp[10];
- RECTL vRect[10];
- USHORT uCtlCount;
-
- m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
- if (pParent)
- hParent = GetWinHwnd(pParent);
- else
- hParent = HWND_DESKTOP;
-
- if (ulStyle == wxDEFAULT_FRAME_STYLE)
- ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
- FCF_MINMAX | FCF_VERTSCROLL | FCF_HORZSCROLL | FCF_TASKLIST;
- else
- {
- if ((ulStyle & wxCAPTION) == wxCAPTION)
- ulCreateFlags = FCF_TASKLIST;
- else
- ulCreateFlags = FCF_NOMOVEWITHOWNER;
-
- if (ulStyle & wxMINIMIZE_BOX)
- ulCreateFlags |= FCF_MINBUTTON;
- if (ulStyle & wxMAXIMIZE_BOX)
- ulCreateFlags |= FCF_MAXBUTTON;
- if (ulStyle & wxTHICK_FRAME)
- ulCreateFlags |= FCF_DLGBORDER;
- if (ulStyle & wxSYSTEM_MENU)
- ulCreateFlags |= FCF_SYSMENU;
- if (ulStyle & wxCAPTION)
- ulCreateFlags |= FCF_TASKLIST;
- if (ulStyle & wxCLIP_CHILDREN)
+ if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
{
- // Invalid for frame windows under PM
+ ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+ ::WinSetOwner(m_hMenu, m_hFrame);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
}
-
- if (ulStyle & wxTINY_CAPTION_VERT)
- ulCreateFlags |= FCF_TASKLIST;
- if (ulStyle & wxTINY_CAPTION_HORIZ)
- ulCreateFlags |= FCF_TASKLIST;
-
- if ((ulStyle & wxTHICK_FRAME) == 0)
- ulCreateFlags |= FCF_BORDER;
- if (ulStyle & wxFRAME_TOOL_WINDOW)
- ulExtraFlags = kFrameToolWindow;
-
- if (ulStyle & wxSTAY_ON_TOP)
- ulCreateFlags |= FCF_SYSMODAL;
- }
- if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
- ulStyleFlags |= WS_MINIMIZED;
- if (ulStyle & wxMAXIMIZE)
- ulStyleFlags |= WS_MAXIMIZED;
-
- //
- // Clear the visible flag, we always call show
- //
- ulStyleFlags &= (unsigned long)~WS_VISIBLE;
- m_bIconized = FALSE;
-
- //
- // Set the frame control block
- //
- vFrameCtlData.cb = sizeof(vFrameCtlData);
- vFrameCtlData.flCreateFlags = ulCreateFlags;
- vFrameCtlData.hmodResources = 0L;
- vFrameCtlData.idResources = 0;
-
- //
- // 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)&vFrameCtlData // Creation data
- ,NULL // Window Pres Params
- )) == 0L)
- {
- return FALSE;
- }
-
- if (!wxWindow::OS2Create( m_hFrame
- ,wxFrameClassName
- ,NULL
- ,0L
- ,0L
- ,0L
- ,0L
- ,0L
- ,NULLHANDLE
- ,HWND_TOP
- ,(unsigned long)FID_CLIENT
- ,NULL
- ,NULL
- ))
- {
- return FALSE;
+ 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
+ );
}
-
- //
- // 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
- ))
- 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));
- }
-
- //
- // 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!
- //
- return TRUE;
-} // end of wxFrame::OS2Create
+ return wxFrameBase::ShowFullScreen(bShow, lStyle);
+} // end of wxFrame::ShowFullScreen
//
-// Default activation behaviour - set the focus for the first child
-// subwindow found.
+// Frame window
//
-void wxFrame::OnActivate(
- wxActivateEvent& rEvent
-)
-{
- 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);
-
- if (GetToolBar())
- {
- int nWidth;
- int nHeight;
-
- GetToolBar()->GetSize( &nWidth
- ,&nHeight
- );
+ wxPoint vPoint = wxTopLevelWindow::GetClientAreaOrigin();
- if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
- {
- vPoint.x += nWidth;
- }
- else
- {
- // PM is backwards from windows
- vPoint.y += nHeight;
- }
- }
+ //
+ // 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;
+ wxToolBar* pToolBar = GetToolBar();
+ wxCoord vWidth;
+ wxCoord vHeight;
+ wxCoord vTWidth;
+ wxCoord vTHeight;
+
+ if (!pToolBar)
+ return;
+
RECTL vRect;
+ RECTL vFRect;
+ wxPoint vPos;
- ::WinQueryWindowRect(GetHwnd(), &vRect);
+ ::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 wxUSE_STATUSBAR
- if (GetStatusBar())
+ if (pToolBar->GetWindowStyleFlag() & wxTB_TOP)
+ {
+ vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
+ pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
+ ,vPos.y
+ ,vWidth
+ ,vTHeight
+ );
+ }
+ else if (pToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
{
- int nStatusX;
- int nStatusY;
+ 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 ( GetToolBar() )
+ else if (pToolBar->GetWindowStyleFlag() & wxTB_LEFT)
{
- int nToolbarWidth;
- int nToolbarHeight;
-
- GetToolBar()->GetSize( &nToolbarWidth
- ,&nToolbarHeight
- );
+ wxCoord vSwidth = 0;
+ wxCoord vSheight = 0;
- 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() )
{
wxWindow* pWin = pNode->GetData();
+ wxFrame* pFrame = wxDynamicCast(pWin, wxFrame);
- if (pWin->IsKindOf(CLASSINFO(wxFrame)) )
+ if ( pFrame
+#if wxUSE_MDI_ARCHITECTURE
+ && !wxDynamicCast(pFrame, wxMDIChildFrame)
+#endif // wxUSE_MDI_ARCHITECTURE
+ )
{
- ((wxFrame *)pWin)->Iconize(bIconize);
+ //
+ // We don't want to restore the child frames which had been
+ // iconized even before we were iconized, so save the child frame
+ // status when iconizing the parent frame and check it when
+ // restoring it.
+ //
+ if (bIconize)
+ {
+ pFrame->m_bWasMinimized = pFrame->IsIconized();
+ }
+
+ //
+ // This test works for both iconizing and restoring
+ //
+ if (!pFrame->m_bWasMinimized)
+ pFrame->Iconize(bIconize);
}
}
+#endif
} // end of wxFrame::IconizeChildFrames
+WXHICON wxFrame::GetDefaultIcon() const
+{
+ return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+ : wxDEFAULT_FRAME_ICON);
+}
// ===========================================================================
// message processing
// ===========================================================================
// ---------------------------------------------------------------------------
// preprocessing
// ---------------------------------------------------------------------------
-bool wxFrame::OS2TranslateMessage(
- WXMSG* pMsg
-)
+bool wxFrame::OS2TranslateMessage( WXMSG* pMsg )
{
- if (wxWindow::OS2TranslateMessage(pMsg))
- return TRUE;
//
// try the menu bar accels
//
- wxMenuBar* pMenuBar = GetMenuBar();
+ wxMenuBar* pMenuBar = GetMenuBar();
- if (!pMenuBar )
- return FALSE;
+ if (!pMenuBar)
+ return false;
+#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
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
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
bool wxFrame::HandlePaint()
{
- RECTL vRect;
+ RECTL vRect;
- if (::WinQueryUpdateRect(m_hFrame, &vRect))
+ if (::WinQueryUpdateRect(GetHWND(), &vRect))
{
if (m_bIconized)
{
//
// Icons in PM are the same as "pointers"
//
+ const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
- if (m_icon.Ok())
+ if (vIcon.Ok())
hIcon = (HPOINTER)::WinSendMsg(m_hFrame, 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
if (hIcon)
{
- HWND hWndClient;
RECTL vRect3;
::WinQueryWindowRect(GetHwnd(), &vRect3);
::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);
}
::WinEndPaint(hPs);
- return TRUE;
}
else
{
- return wxWindow::HandlePaint();
+ if (!wxWindow::HandlePaint())
+ {
+ HPS hPS;
+ RECTL vRect;
+
+ hPS = ::WinBeginPaint( GetHwnd()
+ ,NULLHANDLE
+ ,&vRect
+ );
+ if(hPS)
+ {
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_CONSECRGB
+ ,0L
+ ,(LONG)wxTheColourDatabase->m_nSize
+ ,(PLONG)wxTheColourDatabase->m_palTable
+ );
+ ::GpiCreateLogColorTable( hPS
+ ,0L
+ ,LCOLF_RGB
+ ,0L
+ ,0L
+ ,NULL
+ );
+
+ ::WinFillRect( hPS
+ ,&vRect
+ ,GetBackgroundColour().GetPixel()
+ );
+ ::WinEndPaint(hPS);
+ }
+ }
}
}
- 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);
+ 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);
- m_bIconized = TRUE;
+ IconizeChildFrames(true);
+ (void)SendIconizeEvent();
+ m_bIconized = true;
break;
}
#endif // wxUSE_NATIVE_STATUSBAR
PositionStatusBar();
+#if wxUSE_TOOLBAR
PositionToolBar();
- wxSizeEvent vEvent( wxSize( nX
- ,nY
- )
- ,m_windowId
- );
+#endif // wxUSE_TOOLBAR
- vEvent.SetEventObject(this);
- bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+ 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 );
}
//
// Handle here commands from menus and accelerators
//
- if (nCmd == 0 || nCmd == 1)
+ if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
{
+#if wxUSE_MENUS_NATIVE
if (wxCurrentPopupMenu)
{
wxMenu* pPopupMenu = wxCurrentPopupMenu;
wxCurrentPopupMenu = NULL;
- return pPopupMenu->OS2Command( nCmd
- ,nId
- );
+ 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 )
{
- int nMenuItem;
+ if( !nFlags )
+ {
+ MENUITEM mItem;
+ MRESULT rc;
+
+ rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
- if (nFlags == 0xFFFF && hMenu == 0)
+ 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
+ }
+ else
+ {
+ DoGiveHelp(wxEmptyString, true);
+ return false;
+ }
+ }
+ 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;
+ RECTL vRectl;
+ RECTL vRstb;
+ RECTL vRtlb;
+ int nHeight = 0;
+ int nHeight2 = 0;
+ int nWidth = 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);
+ }
+ 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);
+ ::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)
+ {
+ 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;
+ 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;
+
+ //
+ // 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
-, 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)
{
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 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:
{
+ const wxIcon& vIcon = GetIcon();
HPOINTER hIcon;
- if (m_icon.Ok())
- hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+ if (vIcon.Ok())
+ 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 WXUNUSED(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));
+}
+
+void wxFrame::SendSizeEvent()
+{
+ if (!m_bIconized)
+ {
+ RECTL vRect = wxGetWindowRect(GetHwnd());
+
+ ::WinPostMsg( GetHwnd()
+ ,WM_SIZE
+ ,MPFROM2SHORT( vRect.xRight - vRect.xLeft
+ ,vRect.xRight - vRect.xLeft
+ )
+ ,MPFROM2SHORT( vRect.yTop - vRect.yBottom
+ ,vRect.yTop - vRect.yBottom
+ )
+ );
+ }
+}
projects / wxWidgets.git / blobdiff