#include "wx/dialog.h"
#include "wx/settings.h"
#include "wx/dcclient.h"
+ #include "wx/mdi.h"
#endif // WX_PRECOMP
#include "wx/os2/private.h"
extern wxWindowList wxModelessWindows;
extern wxList WXDLLEXPORT wxPendingDelete;
-extern wxChar wxFrameClassName[];
+
+#if wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu;
+#endif
-extern void wxAssociateWinWithHandle( HWND hWnd
- ,wxWindow* pWin
+extern void wxAssociateWinWithHandle( HWND hWnd
+ ,wxWindowOS2* pWin
);
// ----------------------------------------------------------------------------
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_bIsShown = FALSE;
- m_pWinLastFocused = (wxWindow *)NULL;
+ m_hWndToolTip = 0L;
+ m_bWasMinimized = FALSE;
+ m_pWinLastFocused = NULL;
+
+
+ m_frameMenuBar = NULL;
+ m_frameToolBar = NULL;
+ m_frameStatusBar = NULL;
- m_hFrame = NULL;
- m_hTitleBar = NULL;
- m_hHScroll = NULL;
- m_hVScroll = 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(
, const wxString& rsTitle
, const wxPoint& rPos
, const wxSize& rSize
-, long lulStyle
+, long lStyle
, const wxString& rsName
)
{
- int nX = rPos.x;
- 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 (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;
-
- 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);
+ if (!wxTopLevelWindow::Create( pParent
+ ,vId
+ ,rsTitle
+ ,rPos
+ ,rSize
+ ,lStyle
+ ,rsName
+ ))
+ return FALSE;
+ wxModelessWindows.Append(this);
+ return TRUE;
} // end of wxFrame::Create
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
-
- wxTopLevelWindows.DeleteObject(this);
-
DeleteAllBars();
-
- if (wxTheApp && (wxTopLevelWindows.Number() == 0))
- {
- wxTheApp->SetTopWindow(NULL);
-
- if (wxTheApp->GetExitOnFrameDelete())
- {
- ::WinPostMsg(NULL, 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
{
- RECTL vRect;
- ::WinQueryWindowRect(GetHwnd(), &vRect);
-
+ wxTopLevelWindow::DoGetClientSize( pX
+ ,pY
+ );
//
// 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!
+ // size internally. A ::WinQueryWindowRect (that is called in
+ // wxWindow's GetClient size from above) is all that is needed!
//
-
- if (pX)
- *pX = vRect.xRight - vRect.xLeft;
- if (pY)
- *pY = vRect.yTop - vRect.yBottom;
} // end of wxFrame::DoGetClientSize
//
, int nHeight
)
{
- HWND hWnd = GetHwnd();
- RECTL vRect;
- RECTL vRect2;
-
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- ::WinQueryWindowRect(GetHwnd(), &vRect2);
+ wxStatusBar* pStatusBar = GetStatusBar();
//
- // 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;
- vPointl.y = vRect2.yTop;
-
- ::WinSetWindowPos( hWnd
- ,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);
-
- *pX = vRect.xRight - vRect.xLeft;
- *pY = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetPosition
-
// ----------------------------------------------------------------------------
-// variations around ::ShowWindow()
+// wxFrame: various geometry-related functions
// ----------------------------------------------------------------------------
-void wxFrame::DoShowWindow(
- int bShowCmd
-)
-{
- ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
- m_bIconized = bShowCmd == SWP_MINIMIZE;
-} // 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;
- ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
- ::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;
-
- ::WinQueryWindowPos(m_hFrame, &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
+void wxFrame::Raise()
{
- 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(
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( "X"
+ ,NULL
+ ,&nY
+ );
+
+ int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
+
+ pStatusBar->SetSize( -1
+ ,-1
+ ,-1
+ ,nHeight
+ );
+
::WinSetParent( pStatusBar->GetHWND()
,m_hFrame
,FALSE
if (m_frameStatusBar)
{
int nWidth;
+ int nY;
int nStatbarWidth;
int nStatbarHeight;
HWND hWndClient;
RECTL vFRect;
::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;
+ 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( vRect.xLeft - vFRect.xLeft
- ,vRect.yBottom - vFRect.yBottom
+ ,nY
,nWidth
,nStatbarHeight
);
} // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR
+#if wxUSE_MENUS_NATIVE
void wxFrame::DetachMenuBar()
{
if (m_frameMenuBar)
}
InternalSetMenuBar();
m_frameMenuBar = pMenuBar;
- pMenuBar->Attach(this);
+ pMenuBar->Attach((wxFrame*)this);
}
} // end of wxFrame::SetMenuBar
+void wxFrame::AttachMenuBar(
+ wxMenuBar* pMenubar
+)
+{
+ wxFrameBase::AttachMenuBar(pMenubar);
+
+ m_frameMenuBar = pMenubar;
+
+ if (!pMenubar)
+ {
+ //
+ // Actually remove the menu from the frame
+ //
+ m_hMenu = (WXHMENU)0;
+ InternalSetMenuBar();
+ }
+ else // Set new non NULL menu bar
+ {
+ //
+ // Can set a menubar several times.
+ //
+ if (pMenubar->GetHMenu())
+ {
+ m_hMenu = pMenubar->GetHMenu();
+ }
+ else
+ {
+ if (pMenubar->IsAttached())
+ pMenubar->Detach();
+
+ m_hMenu = pMenubar->Create();
+
+ if (!m_hMenu)
+ return;
+ }
+ InternalSetMenuBar();
+ }
+} // end of wxFrame::AttachMenuBar
+
void wxFrame::InternalSetMenuBar()
{
ERRORID vError;
}
::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
m_lFsStyle = lStyle;
#if wxUSE_TOOLBAR
- wxToolBar* pTheToolBar = GetToolBar();
+ wxToolBar* pTheToolBar = GetToolBar();
#endif //wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
- wxStatusBar* pTheStatusBar = GetStatusBar();
+ wxStatusBar* pTheStatusBar = GetStatusBar();
#endif //wxUSE_STATUSBAR
int nDummyWidth;
//
// 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 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 (pParent)
- hParent = GetWinHwnd(pParent);
- else
- hParent = HWND_DESKTOP;
-
- if (ulStyle == wxDEFAULT_FRAME_STYLE)
- ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
- FCF_MINMAX | FCF_TASKLIST;
- else
- {
- if ((ulStyle & wxCAPTION) == wxCAPTION)
- ulCreateFlags = FCF_TASKLIST;
- 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)
- 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)
- {
- // Invalid for frame windows under PM
- }
-
- 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: 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.
- //
-
- 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;
- }
-
- //
- // 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_ZORDER
- ))
- {
- vError = ::WinGetLastError(vHabmain);
- sError = wxPMErrorToStr(vError);
- wxLogError("Error sizing frame. Error: %s\n", sError);
- return FALSE;
- }
- //
- // 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
-
//
// Default activation behaviour - set the focus for the first child
// subwindow found.
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);
}
}
} // end of wxFrame::IconizeChildFrames
+WXHICON wxFrame::GetDefaultIcon() const
+{
+ return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+ : wxDEFAULT_FRAME_ICON);
+}
// ===========================================================================
// message processing
// ===========================================================================
//
wxMenuBar* pMenuBar = GetMenuBar();
- if (!pMenuBar )
+ if (!pMenuBar)
return FALSE;
-#if wxUSE_ACCEL
+#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable();
return rAcceleratorTable.Translate(GetHWND(), pMsg);
#else
}
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);
+ }
+ }
+ return TRUE;
}
}
else
//
if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
{
+#if wxUSE_MENUS_NATIVE
if (wxCurrentPopupMenu)
{
wxMenu* pPopupMenu = wxCurrentPopupMenu;
return pPopupMenu->OS2Command( nCmd
,nId
);
+ return TRUE;
}
+#endif
if (ProcessCommand(nId))
{
projects / wxWidgets.git / blobdiff