Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for the wxFRAME_FLOAT_ON_PARENT style

Browse Source 
Also add a mode for the wxPOPUP_WINDOW style as a temporary hack to
make it easier using a wxFrame as a replacement for wxPopupWindow.
See how it is used in wxStyledTextCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-01-20 03:23:43 +00:00
parent 01ad5e43bf
commit a0232aa520
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mac/carbon/toplevel.cpp
View File

@@ -929,7 +929,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
m_windowId = id == -1 ? NewControlId() : id;
wxWindow::SetLabel( title ) ;
MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
MacCreateRealWindow( title, pos , size , style , name ) ;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
@@ -1110,6 +1110,20 @@ void wxTopLevelWindowMac::MacCreateRealWindow(
wclass = kPlainWindowClass ;
}
}
else if ( HasFlag( wxPOPUP_WINDOW ) )
{
// TEMPORARY HACK!
// Until we've got a real wxPopupWindow class on wxMac make it a
// little easier for wxFrame to be used to emulate it and workaround
// the lack of wxPopupWindow.
if ( HasFlag( wxBORDER_NONE ) )
wclass = kHelpWindowClass ; // has no border
else
wclass = kPlainWindowClass ; // has a single line border, it will have to do for now
//attr |= kWindowNoShadowAttribute; // turn off the shadow Should we??
group = GetWindowGroupOfClass( // float above other windows
kFloatingWindowClass) ;
}
else if ( HasFlag( wxCAPTION ) )
{
wclass = kDocumentWindowClass ;
@@ -1156,6 +1170,9 @@ void wxTopLevelWindowMac::MacCreateRealWindow(
if ( HasFlag(wxSTAY_ON_TOP) )
group = GetWindowGroupOfClass(kUtilityWindowClass) ;
if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
group = GetWindowGroupOfClass(kFloatingWindowClass) ;
attr |= kWindowCompositingAttribute;
#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
attr |= kWindowFrameworkScaledAttribute;