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

default window creation algorithm for mac platform is changed, now a full window with titlebar is drawn as soon as the style has WX_CAPTION (before it needed WX_THICKFRAME )

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-02-28 14:31:16 +00:00
parent 80645074d8
commit 59c78040cd
2 changed files with 6 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/mac/carbon/window.cpp
View File

@@ -1028,7 +1028,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
attr |= kWindowSideTitlebarAttribute ; attr |= kWindowSideTitlebarAttribute ;
} }
} }
else if ( HasFlag( wxTHICK_FRAME ) ) else if ( HasFlag( wxCAPTION ) )
{ {
if ( HasFlag( wxDIALOG_MODAL ) ) if ( HasFlag( wxDIALOG_MODAL ) )
{ {
@@ -1038,6 +1038,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
{ {
wclass = kDocumentWindowClass ; wclass = kDocumentWindowClass ;
} }
/*
else else
{ {
if ( HasFlag( wxCAPTION ) ) if ( HasFlag( wxCAPTION ) )
@@ -1049,6 +1050,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
wclass = kModalWindowClass ; wclass = kModalWindowClass ;
} }
} }
*/
} }
else else
{ {
@@ -2023,56 +2025,6 @@ void wxWindow::MacSuperChangedPosition()
node = node->Next(); node = node->Next();
} }
} }
/*
bool wxWindow::MacSetupFocusPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupFocusClientPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupDrawingPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupDrawingClientPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ;
}
*/
bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
{ {

54
src/mac/window.cpp
View File

@@ -1028,7 +1028,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
attr |= kWindowSideTitlebarAttribute ; attr |= kWindowSideTitlebarAttribute ;
} }
} }
else if ( HasFlag( wxTHICK_FRAME ) ) else if ( HasFlag( wxCAPTION ) )
{ {
if ( HasFlag( wxDIALOG_MODAL ) ) if ( HasFlag( wxDIALOG_MODAL ) )
{ {
@@ -1038,6 +1038,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
{ {
wclass = kDocumentWindowClass ; wclass = kDocumentWindowClass ;
} }
/*
else else
{ {
if ( HasFlag( wxCAPTION ) ) if ( HasFlag( wxCAPTION ) )
@@ -1049,6 +1050,7 @@ void wxWindow::MacCreateRealWindow( const wxString& title,
wclass = kModalWindowClass ; wclass = kModalWindowClass ;
} }
} }
*/
} }
else else
{ {
@@ -2023,56 +2025,6 @@ void wxWindow::MacSuperChangedPosition()
node = node->Next(); node = node->Next();
} }
} }
/*
bool wxWindow::MacSetupFocusPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupFocusClientPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupDrawingPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ;
}
bool wxWindow::MacSetupDrawingClientPort( )
{
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
wxWindow *rootwin ;
GrafPtr port ;
MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ;
return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ;
}
*/
bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
{ {