grouping of tlw supported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -940,7 +940,7 @@ bool wxTopLevelWindowMac::Create(wxWindow *parent,
|
|||||||
m_windowId = id == -1 ? NewControlId() : id;
|
m_windowId = id == -1 ? NewControlId() : id;
|
||||||
wxWindow::SetLabel( title ) ;
|
wxWindow::SetLabel( title ) ;
|
||||||
|
|
||||||
MacCreateRealWindow( title, pos , size , style , name ) ;
|
DoMacCreateRealWindow( parent, title, pos , size , style , name ) ;
|
||||||
|
|
||||||
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
|
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
|
||||||
|
|
||||||
@@ -1081,6 +1081,17 @@ void wxTopLevelWindowMac::MacCreateRealWindow(
|
|||||||
const wxSize& size,
|
const wxSize& size,
|
||||||
long style,
|
long style,
|
||||||
const wxString& name )
|
const wxString& name )
|
||||||
|
{
|
||||||
|
DoMacCreateRealWindow( NULL, title, pos, size, style, name );
|
||||||
|
}
|
||||||
|
|
||||||
|
void wxTopLevelWindowMac::DoMacCreateRealWindow(
|
||||||
|
wxWindow* parent,
|
||||||
|
const wxString& title,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
long style,
|
||||||
|
const wxString& name )
|
||||||
{
|
{
|
||||||
OSStatus err = noErr ;
|
OSStatus err = noErr ;
|
||||||
SetName(name);
|
SetName(name);
|
||||||
@@ -1194,6 +1205,13 @@ void wxTopLevelWindowMac::MacCreateRealWindow(
|
|||||||
if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
|
if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
|
||||||
group = GetWindowGroupOfClass(kFloatingWindowClass) ;
|
group = GetWindowGroupOfClass(kFloatingWindowClass) ;
|
||||||
|
|
||||||
|
if ( group == NULL && parent != NULL )
|
||||||
|
{
|
||||||
|
WindowRef parenttlw = (WindowRef) parent->MacGetTopLevelWindowRef();
|
||||||
|
if( parenttlw )
|
||||||
|
group = GetWindowGroup( parenttlw );
|
||||||
|
}
|
||||||
|
|
||||||
attr |= kWindowCompositingAttribute;
|
attr |= kWindowCompositingAttribute;
|
||||||
#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
|
#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
|
||||||
attr |= kWindowFrameworkScaledAttribute;
|
attr |= kWindowFrameworkScaledAttribute;
|
||||||
|
Reference in New Issue
Block a user