GetMacXXXX renamed to MacGetXXXXX

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

diff --git a/src/mac/carbon/gauge.cpp b/src/mac/carbon/gauge.cpp
index 9076466a4a9da2d23b3aedf808a7f9f47bb11252..38367d88c666e7eb7983ba00fce52292f0d8a480 100644 (file)
--- a/src/mac/carbon/gauge.cpp
+++ b/src/mac/carbon/gauge.cpp
@@ -41,7 +41,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 

-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , range, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , range, 

                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/glcanvas.cpp b/src/mac/carbon/glcanvas.cpp
index 2ff4a891281280606ad0baf1ae5123c0f0d907f0..ae60210ef3466d9f79ab9b4f088fbb39d568e429 100644 (file)
--- a/src/mac/carbon/glcanvas.cpp
+++ b/src/mac/carbon/glcanvas.cpp
@@ -45,7 +45,7 @@ wxGLContext::wxGLContext(
 {
     m_window = win;
 
 {
     m_window = win;
 

-    m_drawable = (AGLDrawable) UMAGetWindowPort(win->GetMacRootWindow());
+    m_drawable = (AGLDrawable) UMAGetWindowPort(win->MacGetRootWindow());

 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );


@@ -216,7 +216,6 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {

-       m_macEraseOnRedraw = false ;

     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);


@@ -252,7 +251,7 @@ void wxGLCanvas::SetViewport()
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;

-    GetWindowPortBounds( GetMacRootWindow() , &bounds ) ;
+    GetWindowPortBounds( MacGetRootWindow() , &bounds ) ;

     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;

diff --git a/src/mac/gauge.cpp b/src/mac/gauge.cpp
index 9076466a4a9da2d23b3aedf808a7f9f47bb11252..38367d88c666e7eb7983ba00fce52292f0d8a480 100644 (file)
--- a/src/mac/gauge.cpp
+++ b/src/mac/gauge.cpp
@@ -41,7 +41,7 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ;
 

-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , range, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , range, 

                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;
                kControlProgressBarProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/glcanvas.cpp b/src/mac/glcanvas.cpp
index 2ff4a891281280606ad0baf1ae5123c0f0d907f0..ae60210ef3466d9f79ab9b4f088fbb39d568e429 100644 (file)
--- a/src/mac/glcanvas.cpp
+++ b/src/mac/glcanvas.cpp
@@ -45,7 +45,7 @@ wxGLContext::wxGLContext(
 {
     m_window = win;
 
 {
     m_window = win;
 

-    m_drawable = (AGLDrawable) UMAGetWindowPort(win->GetMacRootWindow());
+    m_drawable = (AGLDrawable) UMAGetWindowPort(win->MacGetRootWindow());

 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );
 
     m_glContext = aglCreateContext(fmt, other ? other->m_glContext : NULL);
     wxCHECK_RET( m_glContext, wxT("Couldn't create OpenGl context") );


@@ -216,7 +216,6 @@ bool wxGLCanvas::Create(wxWindow *parent, const wxGLContext *shared, wxWindowID
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {
                        const wxPoint& pos, const wxSize& size, long style, const wxString& name,
                        int *attribList, const wxPalette& palette)
 {

-       m_macEraseOnRedraw = false ;

     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);
     wxWindow::Create( parent, id, pos, size, style, name );
 
     AGLPixelFormat fmt = ChoosePixelFormat(attribList);


@@ -252,7 +251,7 @@ void wxGLCanvas::SetViewport()
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;
     int width, height;
     GetClientSize(& width, & height);
     Rect bounds ;

-    GetWindowPortBounds( GetMacRootWindow() , &bounds ) ;
+    GetWindowPortBounds( MacGetRootWindow() , &bounds ) ;

     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;
     GLint parms[4] ;
     parms[0] = x ;
     parms[1] = bounds.bottom - bounds.top - ( y + height ) ;