#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
+ #include "wx/control.h"
#endif //WX_PRECOMP
#include "wx/os2/private.h"
wxWindowList wxModelessWindows;
// the name of the default wxWindows class
-extern const wxChar* wxCanvasClassName;
-extern const wxChar* wxFrameClassName;
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
+bool wxTopLevelWindowOS2::m_sbInitialized = FALSE;
// ============================================================================
// wxTopLevelWindowMSW implementation
memset(&m_vSwpClient, 0, sizeof(SWP));
} // end of wxTopLevelWindowIOS2::Init
-long wxTopLevelWindowOS2::OS2GetCreateWindowFlags(
- long* plExflags
+WXDWORD wxTopLevelWindowOS2::OS2GetStyle(
+ long lStyle
+, WXDWORD* pdwExflags
) const
{
- long lStyle = GetWindowStyle();
- long lMsflags = 0;
+ long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE
+ ,pdwExflags
+ );
if (lStyle == wxDEFAULT_FRAME_STYLE)
- lMsflags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
- FCF_MINMAX | FCF_TASKLIST;
+ lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
+ FCF_MINMAX | FCF_TASKLIST;
else
{
if ((lStyle & wxCAPTION) == wxCAPTION)
- lMsflags = FCF_TASKLIST;
+ lMsflags |= FCF_TASKLIST;
else
- lMsflags = FCF_NOMOVEWITHOWNER;
+ lMsflags |= FCF_NOMOVEWITHOWNER;
if ((lStyle & wxVSCROLL) == wxVSCROLL)
lMsflags |= FCF_VERTSCROLL;
if ((lStyle & wxTHICK_FRAME) == 0)
lMsflags |= FCF_BORDER;
if (lStyle & wxFRAME_TOOL_WINDOW)
- *plExflags = kFrameToolWindow;
+ *pdwExflags = kFrameToolWindow;
if (lStyle & wxSTAY_ON_TOP)
lMsflags |= FCF_SYSMODAL;
}
HWND hWndDlg;
- HWND hWndParent;
+ HWND hWndOwner;
if (pParent)
- hWndParent = GetHwndOf(pParent);
+ hWndOwner = GetHwndOf(pParent);
else
- hWndParent = HWND_DESKTOP;
+ hWndOwner = HWND_DESKTOP;
- hWndDlg = ::WinLoadDlg( hWndParent
- ,hWndParent
+ hWndDlg = ::WinLoadDlg( HWND_DESKTOP
+ ,hWndOwner
,(PFNWP)wxDlgProc
,NULL
,(ULONG)ulDlgTemplate
nX = (vSizeDpy.x - nWidth) / 2;
nY = (vSizeDpy.y - nHeight) / 2;
}
+ m_backgroundColour.Set(wxString("LIGHT GREY"));
+
+ LONG lColor = (LONG)m_backgroundColour.GetPixel();
+
+ if (!::WinSetPresParam( m_hWnd
+ ,PP_BACKGROUNDCOLOR
+ ,sizeof(LONG)
+ ,(PVOID)&lColor
+ ))
+ {
+ return FALSE;
+ }
+
::WinSetWindowPos( GetHwnd()
,HWND_TOP
,nX
,nHeight
,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW
);
- if (!rsTitle.IsNull())
- {
- ::WinSetWindowText(GetHwnd(), rsTitle.c_str());
- }
+ ::WinQueryWindowPos(GetHwnd(), GetSwp());
+ m_hFrame = m_hWnd;
SubclassWin(m_hWnd);
return TRUE;
} // end of wxTopLevelWindowOS2::CreateDialog
, const wxSize& rSize
)
{
- long lExflags;
- long lFlags = OS2GetCreateWindowFlags(&lExflags);
+ WXDWORD lExflags;
+ WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags);
long lStyle = GetWindowStyleFlag();
int nX = rPos.x;
int nY = rPos.y;
wxAssociateWinWithHandle(m_hWnd, this);
wxAssociateWinWithHandle(m_hFrame, this);
- m_backgroundColour.Set(wxString("GREY"));
+ m_backgroundColour.Set(wxString("MEDIUM GREY"));
LONG lColor = (LONG)m_backgroundColour.GetPixel();
wxLogError("Error sizing frame. Error: %s\n", sError);
return FALSE;
}
+ lStyle = ::WinQueryWindowULong( m_hWnd
+ ,QWL_STYLE
+ );
+ lStyle |= WS_CLIPCHILDREN;
+ ::WinSetWindowULong( m_hWnd
+ ,QWL_STYLE
+ ,lStyle
+ );
return TRUE;
} // end of wxTopLevelWindowOS2::CreateFrame
}
} // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2
-//
-// IF we have child controls in the Frame's client we need to alter
-// the y position, because, OS/2 controls are positioned relative to
-// wxWindows orgin (top left) not the OS/2 origin (bottom left)
-//
-void wxTopLevelWindowOS2::AlterChildPos()
-{
- //
- // OS/2 is the only OS concerned about this
- //
- wxWindow* pChild = NULL;
- wxControl* pCtrl = NULL;
- RECTL vRect;
- SWP vSwp;
-
- ::WinQueryWindowRect(GetHwnd(), &vRect);
- for (wxWindowList::Node* pNode = GetChildren().GetFirst();
- pNode;
- pNode = pNode->GetNext())
- {
- wxWindow* pChild = pNode->GetData();
-
- ::WinQueryWindowPos(pChild->GetHWND(), &vSwp);
- vSwp.y += (vRect.yTop - m_vSwpClient.cy);
- if (pChild->IsKindOf(CLASSINFO(wxControl)))
- {
- pCtrl = wxDynamicCast(pChild, wxControl);
- //
- // Must deal with controls that have margins like ENTRYFIELD. The SWP
- // struct of such a control will have and origin offset from its intended
- // position by the width of the margins.
- //
- vSwp.y -= pCtrl->GetYComp();
- vSwp.x -= pCtrl->GetXComp();
- }
- ::WinSetWindowPos( pChild->GetHWND()
- ,HWND_TOP
- ,vSwp.x
- ,vSwp.y
- ,vSwp.cx
- ,vSwp.cy
- ,SWP_MOVE
- );
- ::WinQueryWindowPos(pChild->GetHWND(), &vSwp);
- pChild = NULL;
- }
- ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient);
-} // end of wxTopLevelWindowOS2::AlterChildPos
-
-void wxTopLevelWindowOS2::UpdateInternalSize(
- wxWindow* pChild
-, int nHeight
-)
-{
- pChild->MoveChildren(m_vSwpClient.cy - nHeight);
- ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient);
-} // end of wxTopLevelWindowOS2::UpdateInternalSize
-
// ----------------------------------------------------------------------------
// wxTopLevelWindowOS2 client size
// ----------------------------------------------------------------------------
int nShowCmd
)
{
- ::WinShowWindow(m_hFrame, (BOOL)nShowCmd);
+ ::WinShowWindow(m_hFrame, (BOOL)(nShowCmd & SWP_SHOW));
+
+ //
+ // Need to artificially send a size event as wxApps often expect to do some
+ // final child control sizing
+ SendSizeEvent();
m_bIconized = nShowCmd == SWP_MINIMIZE;
} // end of wxTopLevelWindowOS2::DoShowWindow
{
if (m_bMaximizeOnShow)
{
- nShowCmd = SWP_SHOW;
+ nShowCmd = SWP_MAXIMIZE;
m_bMaximizeOnShow = FALSE;
}
else
{
- nShowCmd = SWP_HIDE;
+ nShowCmd = SWP_SHOW;
}
}
else // hide
m_bIconized = vSwp.fl & SWP_MINIMIZE;
::WinQueryWindowPos(m_hWnd, &m_vSwpClient);
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+ ::WinQueryWindowPos(m_hWnd, &vSwp);
::WinEnableWindow(m_hFrame, TRUE);
+
+ //
+ // Deal with children
+ //
+ MoveChildren(m_vSwpClient.cy - vSwp.cy);
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
}
DoShowWindow(SWP_RESTORE);
} // end of wxTopLevelWindowOS2::Restore
+// generate an artificial resize event
+void wxTopLevelWindowOS2::SendSizeEvent()
+{
+ if (!m_bIconized)
+ {
+ RECTL vRect = wxGetWindowRect(GetHwnd());
+
+ (void)::WinPostMsg( m_hFrame
+ ,WM_SIZE
+ ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+ ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom)
+ );
+ }
+} // end of wxTopLevelWindowOS2::SendSizeEvent
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowOS2 fullscreen
// ----------------------------------------------------------------------------
void wxTopLevelWindowOS2::SetIcon(
const wxIcon& rIcon
)
+{
+ SetIcons(wxIconBundle(rIcon));
+} // end of wxTopLevelWindowOS2::SetIcon
+
+void wxTopLevelWindowOS2::SetIcons(
+ const wxIconBundle& rIcons
+)
{
//
// This sets m_icon
//
- wxTopLevelWindowBase::SetIcon(rIcon);
+ wxTopLevelWindowBase::SetIcons(rIcons);
+
+ const wxIcon& vIcon = rIcons.GetIcon(wxSize(32, 32));
- if (m_icon.Ok())
+ if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32)
{
::WinSendMsg( m_hFrame
,WM_SETICON
- ,(MPARAM)((HPOINTER)m_icon.GetHICON())
+ ,(MPARAM)((HPOINTER)vIcon.GetHICON())
,NULL
);
::WinSendMsg( m_hFrame
projects / wxWidgets.git / blobdiff