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

title-less windows also for windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-17 14:10:29 +00:00
parent 54ddeb7e1b
commit f574489317
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,12 +256,23 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
if ( HasFlag( wxFRAME_TOOL_WINDOW) /*|| HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)*/ ) if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{ {
wclass = kFloatingWindowClass ; if (
if ( HasFlag(wxTINY_CAPTION_VERT) ) HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
)
{ {
attr |= kWindowSideTitlebarAttribute ; wclass = kFloatingWindowClass ;
if ( HasFlag(wxTINY_CAPTION_VERT) )
{
attr |= kWindowSideTitlebarAttribute ;
}
}
else
{
wclass = kPlainWindowClass ;
} }
} }
else if ( HasFlag( wxCAPTION ) ) else if ( HasFlag( wxCAPTION ) )
@@ -277,7 +288,15 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
wclass = kDocumentWindowClass ; if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) )
{
wclass = kDocumentWindowClass ;
}
else
{
wclass = kPlainWindowClass ;
}
} }
if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )

29
src/mac/toplevel.cpp
View File

@@ -256,12 +256,23 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
if ( HasFlag( wxFRAME_TOOL_WINDOW) /*|| HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)*/ ) if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{ {
wclass = kFloatingWindowClass ; if (
if ( HasFlag(wxTINY_CAPTION_VERT) ) HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
)
{ {
attr |= kWindowSideTitlebarAttribute ; wclass = kFloatingWindowClass ;
if ( HasFlag(wxTINY_CAPTION_VERT) )
{
attr |= kWindowSideTitlebarAttribute ;
}
}
else
{
wclass = kPlainWindowClass ;
} }
} }
else if ( HasFlag( wxCAPTION ) ) else if ( HasFlag( wxCAPTION ) )
@@ -277,7 +288,15 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
} }
else else
{ {
wclass = kDocumentWindowClass ; if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) )
{
wclass = kDocumentWindowClass ;
}
else
{
wclass = kPlainWindowClass ;
}
} }
if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) )