GetMacXXXX renamed MacGetXXXX

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

diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp
index c1a5949c9dc547c46d4dcaf4ede0ee00b716212d..2a93999107c337aa77dfac453f15962eece424b4 100644 (file)
--- a/src/mac/bmpbuttn.cpp
+++ b/src/mac/bmpbuttn.cpp
@@ -57,7 +57,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
        
        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 
                kControlBehaviorOffsetContents + 
                    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
                (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;

diff --git a/src/mac/button.cpp b/src/mac/button.cpp
index 83cdba79e008cd151a574309749453df2e0edf8b..072ba017205b529ceeeffce85c093c780b1d26d4 100644 (file)
--- a/src/mac/button.cpp
+++ b/src/mac/button.cpp
@@ -37,7 +37,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        

diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp
index c1a5949c9dc547c46d4dcaf4ede0ee00b716212d..2a93999107c337aa77dfac453f15962eece424b4 100644 (file)
--- a/src/mac/carbon/bmpbuttn.cpp
+++ b/src/mac/carbon/bmpbuttn.cpp
@@ -57,7 +57,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
        
        MacPreControlCreate( parent , id ,  "" , pos , wxSize( width , height ) ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 
                kControlBehaviorOffsetContents + 
                    ( bmap->m_bitmapType == kMacBitmapTypeIcon ? kControlContentCIconHandle : kControlContentPictHandle ) , 0, 
                (( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;

diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp
index 83cdba79e008cd151a574309749453df2e0edf8b..072ba017205b529ceeeffce85c093c780b1d26d4 100644 (file)
--- a/src/mac/carbon/button.cpp
+++ b/src/mac/carbon/button.cpp
@@ -37,7 +37,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlPushButtonProc , (long) this ) ;
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
        

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index d83a2fed0534a2eb275799547009b3e4854a27f8..e17deb180db32ad7ff1995b0a545aae4806eabe0 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -36,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlCheckBoxProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 9f05a58372d946bde1aab048bb7edd1da4d49522..2ec18bc54626c5ab24817281369e4dc3ce5220f1 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -45,7 +45,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-               m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
+               m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewUniqueMenu() ;

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index 5dabd2dd49f5ea1d989432c838fc7d91331d04fa..712a6dddbfa34eda49bfadd71cfbca4843b28e28 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -47,7 +47,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
        
-               m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
+               m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewUniqueMenu() ;

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ffbe8e70358ce8c5e161d65fd4edbe8844b9fd69..7cfcbc5bce7e685abdbf157760287ddaa2342f1f 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -168,7 +168,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Size asize;
 
 
-    CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
                           14, 14, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
@@ -180,7 +180,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
     long    result ;
 
-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
@@ -588,7 +588,7 @@ void wxListBox::SetupColours()
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     // Set up port
-    WindowRef rootwindow = GetMacRootWindow() ;
+    WindowRef rootwindow = MacGetRootWindow() ;
     wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
     wxMacDrawingHelper focus( wxrootwindow );
 

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 88e098ac96b03b8c1618c9979b6df9331d91ce5a..52f69eb69fc6b43e31390582cf0a489f9f208344 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -115,7 +115,7 @@ bool wxNotebook::Create(wxWindow *parent,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;
@@ -299,7 +299,7 @@ void wxNotebook::MacSetupTabs()
     }
     Rect bounds;
     GetControlBounds(m_macControl, &bounds);
-    InvalWindowRect(GetMacRootWindow(), &bounds);
+    InvalWindowRect(MacGetRootWindow(), &bounds);
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index f4c7ca150934c413e07b8242d1c8a647548dfdf9..e3d5abd2a6df9b59ea3ab0efff7ba14081dca76b 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -117,7 +117,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
     for (i = 0; i < n; i++)

diff --git a/src/mac/carbon/radiobut.cpp b/src/mac/carbon/radiobut.cpp
index 476cf9ef10b3ac7782252353742e29d4f2b908c4..a0a8885b16058de4359b3d1d636236554330874f 100644 (file)
--- a/src/mac/carbon/radiobut.cpp
+++ b/src/mac/carbon/radiobut.cpp
@@ -35,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index c417484f02647c2963a31e544427f1ca7af0ccca..51c01e4cefec4ea31db117e7dd7faedcbc50ad80 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -43,7 +43,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , true , 0 , 0 , 100, 
                kControlScrollBarLiveProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 459a15c76b7820119de7b3058bbf0837044c8dbe..2f8854acc2351c88f2a9ba6cfe4249b74a752aaf 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -84,7 +84,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     }
   
 
-     m_macControl = ::NewControl( parent->GetMacRootWindow(), &bounds, title, false,
+     m_macControl = ::NewControl( parent->MacGetRootWindow(), &bounds, title, false,
                                    value, minValue, maxValue, procID, (long) this);
  
      wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@ -408,7 +408,7 @@ void wxSlider::MacHandleControlClick( ControlHandle control , SInt16 controlpart
  
          // Update window at old and new positions
          SetRect(&newbounds, m_x, m_y, m_x + m_width, m_y + m_height);
-         WindowRef rootwindow = GetMacRootWindow();
+         WindowRef rootwindow = MacGetRootWindow();
          InvalWindowRect( rootwindow , &oldbounds );
          InvalWindowRect( rootwindow , &newbounds );
  

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index b396d675d0922d604dadc48ebe26fcf8ced9c469..87db4b041a37b355dfbb7eabb936a7e7fe2cafed 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -49,7 +49,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 100, 
                kControlLittleArrowsProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index 400eb43169e524aceec43cc43a76882e5a9f5310..1a562c12e6c3b7b75a543a08bd3b35952179a757 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -43,7 +43,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp
index 175708d1fa623d75893bf8ef4bf3b5ee0394787b..0272ed706e0bd76c140de6cea58ab0d373d8d3c4 100644 (file)
--- a/src/mac/carbon/statlmac.cpp
+++ b/src/mac/carbon/statlmac.cpp
@@ -54,7 +54,7 @@ bool wxStaticLine::Create( wxWindow *parent,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlSeparatorLineProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index 7bb7a464f269e06232f338f801c8a4634a11fba4..9231ea3d41fb0f9402443e4635741b0d42a981f4 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -41,7 +41,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 4270eefb1c7a176e1439cbb0bede4234bd5c9f2d..08950c5c74fc7794d48ac5012fb91a559ec9b081 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -124,7 +124,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     }
 
 
-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
         ( style & wxTE_PASSWORD ) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
     MacPostControlCreate() ;
 
@@ -179,7 +179,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     else
         value = st ;
     ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-    WindowRef window = GetMacRootWindow() ;
+    WindowRef window = MacGetRootWindow() ;
     if ( window )
     {
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -193,9 +193,9 @@ void wxTextCtrl::SetValue(const wxString& st)
             wxWindow* parent = GetParent() ;
             while ( parent )
             {
-                if( parent->MacGetWindowData() )
+                if( parent->IsTopLevel() )
                 {
-                    ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+//                    ::SetThemeWindowBackground( win->MacGetRootWindow() , kThemeBrushDialogBackgroundActive , false ) ;
                     break ;
                 }
                 
@@ -210,7 +210,7 @@ void wxTextCtrl::SetValue(const wxString& st)
             } 
             
             UMADrawControl( m_macControl ) ;
-            ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+//            ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
         }
     }
 }
@@ -255,7 +255,7 @@ void wxTextCtrl::Paste()
         ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
         TEFromScrap() ;
         TEPaste( teH ) ;
-        WindowRef window = GetMacRootWindow() ;
+        WindowRef window = MacGetRootWindow() ;
         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -269,9 +269,9 @@ void wxTextCtrl::Paste()
                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {
-                    if( parent->MacGetWindowData() )
+                    if( parent->IsTopLevel() )
                     {
-                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+//                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
                         break ;
                     }
                     
@@ -286,7 +286,7 @@ void wxTextCtrl::Paste()
                 } 
                 
                 UMADrawControl( m_macControl ) ;
-                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+//                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
             }
         }
     }
@@ -1772,12 +1772,12 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     if ( style & wxTE_PASSWORD )
     {
-      m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
+      m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
         kControlEditTextPasswordProc , (long) this ) ;
     }
     else
     {
-    if ( mUPCreateControl(parent->GetMacRootWindow(), &bounds, &m_macControl) != noErr ) 
+    if ( mUPCreateControl(parent->MacGetRootWindow(), &bounds, &m_macControl) != noErr ) 
       return FALSE ;
     }
     MacPostControlCreate() ;
@@ -1887,7 +1887,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (const char*)value, value.Length(),
       kTXNStartOffset, kTXNEndOffset);
   }
-    WindowRef window = GetMacRootWindow() ;
+    WindowRef window = MacGetRootWindow() ;
     if ( window )
     {
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -1979,7 +1979,7 @@ void wxTextCtrl::Paste()
                ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
                TEFromScrap() ;
                TEPaste( teH ) ;
-               WindowRef window = GetMacRootWindow() ;
+               WindowRef window = MacGetRootWindow() ;
                if ( window )
                {
                        wxWindow* win = wxFindWinFromMacWindow( window ) ;

diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp
index d83a2fed0534a2eb275799547009b3e4854a27f8..e17deb180db32ad7ff1995b0a545aae4806eabe0 100644 (file)
--- a/src/mac/checkbox.cpp
+++ b/src/mac/checkbox.cpp
@@ -36,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlCheckBoxProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 9f05a58372d946bde1aab048bb7edd1da4d49522..2ec18bc54626c5ab24817281369e4dc3ce5220f1 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -45,7 +45,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-               m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
+               m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewUniqueMenu() ;

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 5dabd2dd49f5ea1d989432c838fc7d91331d04fa..712a6dddbfa34eda49bfadd71cfbca4843b28e28 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -47,7 +47,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
        
-               m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
+               m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , -12345 , 0, 
                kControlPopupButtonProc , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewUniqueMenu() ;

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index ffbe8e70358ce8c5e161d65fd4edbe8844b9fd69..7cfcbc5bce7e685abdbf157760287ddaa2342f1f 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -168,7 +168,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Size asize;
 
 
-    CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
                           14, 14, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
@@ -180,7 +180,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
     long    result ;
 
-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
@@ -588,7 +588,7 @@ void wxListBox::SetupColours()
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     // Set up port
-    WindowRef rootwindow = GetMacRootWindow() ;
+    WindowRef rootwindow = MacGetRootWindow() ;
     wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
     wxMacDrawingHelper focus( wxrootwindow );
 

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index 88e098ac96b03b8c1618c9979b6df9331d91ce5a..52f69eb69fc6b43e31390582cf0a489f9f208344 100644 (file)
--- a/src/mac/notebmac.cpp
+++ b/src/mac/notebmac.cpp
@@ -115,7 +115,7 @@ bool wxNotebook::Create(wxWindow *parent,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;
@@ -299,7 +299,7 @@ void wxNotebook::MacSetupTabs()
     }
     Rect bounds;
     GetControlBounds(m_macControl, &bounds);
-    InvalWindowRect(GetMacRootWindow(), &bounds);
+    InvalWindowRect(MacGetRootWindow(), &bounds);
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index f4c7ca150934c413e07b8242d1c8a647548dfdf9..e3d5abd2a6df9b59ea3ab0efff7ba14081dca76b 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -117,7 +117,7 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, val , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
     for (i = 0; i < n; i++)

diff --git a/src/mac/radiobut.cpp b/src/mac/radiobut.cpp
index 476cf9ef10b3ac7782252353742e29d4f2b908c4..a0a8885b16058de4359b3d1d636236554330874f 100644 (file)
--- a/src/mac/radiobut.cpp
+++ b/src/mac/radiobut.cpp
@@ -35,7 +35,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlRadioButtonProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index c417484f02647c2963a31e544427f1ca7af0ccca..51c01e4cefec4ea31db117e7dd7faedcbc50ad80 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -43,7 +43,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , true , 0 , 0 , 100, 
                kControlScrollBarLiveProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;

diff --git a/src/mac/slider.cpp b/src/mac/slider.cpp
index 459a15c76b7820119de7b3058bbf0837044c8dbe..2f8854acc2351c88f2a9ba6cfe4249b74a752aaf 100644 (file)
--- a/src/mac/slider.cpp
+++ b/src/mac/slider.cpp
@@ -84,7 +84,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     }
   
 
-     m_macControl = ::NewControl( parent->GetMacRootWindow(), &bounds, title, false,
+     m_macControl = ::NewControl( parent->MacGetRootWindow(), &bounds, title, false,
                                    value, minValue, maxValue, procID, (long) this);
  
      wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@ -408,7 +408,7 @@ void wxSlider::MacHandleControlClick( ControlHandle control , SInt16 controlpart
  
          // Update window at old and new positions
          SetRect(&newbounds, m_x, m_y, m_x + m_width, m_y + m_height);
-         WindowRef rootwindow = GetMacRootWindow();
+         WindowRef rootwindow = MacGetRootWindow();
          InvalWindowRect( rootwindow , &oldbounds );
          InvalWindowRect( rootwindow , &newbounds );
  

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index b396d675d0922d604dadc48ebe26fcf8ced9c469..87db4b041a37b355dfbb7eabb936a7e7fe2cafed 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -49,7 +49,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 100, 
                kControlLittleArrowsProc , (long) this ) ;
        
        wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;

diff --git a/src/mac/statbox.cpp b/src/mac/statbox.cpp
index 400eb43169e524aceec43cc43a76882e5a9f5310..1a562c12e6c3b7b75a543a08bd3b35952179a757 100644 (file)
--- a/src/mac/statbox.cpp
+++ b/src/mac/statbox.cpp
@@ -43,7 +43,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
        
        MacPreControlCreate( parent , id ,  label , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/statlmac.cpp b/src/mac/statlmac.cpp
index 175708d1fa623d75893bf8ef4bf3b5ee0394787b..0272ed706e0bd76c140de6cea58ab0d373d8d3c4 100644 (file)
--- a/src/mac/statlmac.cpp
+++ b/src/mac/statlmac.cpp
@@ -54,7 +54,7 @@ bool wxStaticLine::Create( wxWindow *parent,
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlSeparatorLineProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/tabctrl.cpp b/src/mac/tabctrl.cpp
index 7bb7a464f269e06232f338f801c8a4634a11fba4..9231ea3d41fb0f9402443e4635741b0d42a981f4 100644 (file)
--- a/src/mac/tabctrl.cpp
+++ b/src/mac/tabctrl.cpp
@@ -41,7 +41,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
        
        MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 4270eefb1c7a176e1439cbb0bede4234bd5c9f2d..08950c5c74fc7794d48ac5012fb91a559ec9b081 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -124,7 +124,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     }
 
 
-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
         ( style & wxTE_PASSWORD ) ? kControlEditTextPasswordProc : kControlEditTextProc , (long) this ) ;
     MacPostControlCreate() ;
 
@@ -179,7 +179,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     else
         value = st ;
     ::SetControlData( m_macControl, 0, ( m_windowStyle & wxTE_PASSWORD ) ? kControlEditTextPasswordTag : kControlEditTextTextTag , value.Length() , (char*) ((const char*)value) ) ;
-    WindowRef window = GetMacRootWindow() ;
+    WindowRef window = MacGetRootWindow() ;
     if ( window )
     {
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -193,9 +193,9 @@ void wxTextCtrl::SetValue(const wxString& st)
             wxWindow* parent = GetParent() ;
             while ( parent )
             {
-                if( parent->MacGetWindowData() )
+                if( parent->IsTopLevel() )
                 {
-                    ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+//                    ::SetThemeWindowBackground( win->MacGetRootWindow() , kThemeBrushDialogBackgroundActive , false ) ;
                     break ;
                 }
                 
@@ -210,7 +210,7 @@ void wxTextCtrl::SetValue(const wxString& st)
             } 
             
             UMADrawControl( m_macControl ) ;
-            ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+//            ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
         }
     }
 }
@@ -255,7 +255,7 @@ void wxTextCtrl::Paste()
         ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
         TEFromScrap() ;
         TEPaste( teH ) ;
-        WindowRef window = GetMacRootWindow() ;
+        WindowRef window = MacGetRootWindow() ;
         if ( window )
         {
             wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -269,9 +269,9 @@ void wxTextCtrl::Paste()
                 wxWindow* parent = GetParent() ;
                 while ( parent )
                 {
-                    if( parent->MacGetWindowData() )
+                    if( parent->IsTopLevel() )
                     {
-                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+//                        ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
                         break ;
                     }
                     
@@ -286,7 +286,7 @@ void wxTextCtrl::Paste()
                 } 
                 
                 UMADrawControl( m_macControl ) ;
-                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+//                ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
             }
         }
     }
@@ -1772,12 +1772,12 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     if ( style & wxTE_PASSWORD )
     {
-      m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
+      m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
         kControlEditTextPasswordProc , (long) this ) ;
     }
     else
     {
-    if ( mUPCreateControl(parent->GetMacRootWindow(), &bounds, &m_macControl) != noErr ) 
+    if ( mUPCreateControl(parent->MacGetRootWindow(), &bounds, &m_macControl) != noErr ) 
       return FALSE ;
     }
     MacPostControlCreate() ;
@@ -1887,7 +1887,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     TXNSetData( (**tpvars).fTXNRec, kTXNTextData,  (const char*)value, value.Length(),
       kTXNStartOffset, kTXNEndOffset);
   }
-    WindowRef window = GetMacRootWindow() ;
+    WindowRef window = MacGetRootWindow() ;
     if ( window )
     {
         wxWindow* win = wxFindWinFromMacWindow( window ) ;
@@ -1979,7 +1979,7 @@ void wxTextCtrl::Paste()
                ::GetControlData( m_macControl , 0, kControlEditTextTEHandleTag , sizeof( TEHandle ) , (char*) &teH , &size ) ;
                TEFromScrap() ;
                TEPaste( teH ) ;
-               WindowRef window = GetMacRootWindow() ;
+               WindowRef window = MacGetRootWindow() ;
                if ( window )
                {
                        wxWindow* win = wxFindWinFromMacWindow( window ) ;