default window creation algorithm for mac platform is changed, now a full window...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index b88a8a395948e5ce0ab9ff302d84789d427d923b..605f3af77c7b9dc337ceac41a233a81d460292ec 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -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
                {
                        if ( HasFlag( wxCAPTION ) )
                else
                {
                        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 ) 
 {

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index b88a8a395948e5ce0ab9ff302d84789d427d923b..605f3af77c7b9dc337ceac41a233a81d460292ec 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -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
                {
                        if ( HasFlag( wxCAPTION ) )
                else
                {
                        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 ) 
 {