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

GetMacXXXX to MacGetXXXX

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2001-12-19 21:53:44 +00:00
parent a7b04cfc5b
commit cd9bcf8a6e
2 changed files with 286 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mac/carbon/toolbar.cpp
View File

@@ -399,7 +399,7 @@ void wxToolBar::MacSuperChangedPosition()
int maxHeight = 0 ; int maxHeight = 0 ;
int toolcount = 0 ; int toolcount = 0 ;
{ {
WindowRef rootwindow = GetMacRootWindow() ; WindowRef rootwindow = MacGetRootWindow() ;
wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ; ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
wxMacDrawingHelper focus( wxrootwindow ) ; wxMacDrawingHelper focus( wxrootwindow ) ;
@@ -594,9 +594,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
wxWindow* parent = GetParent() ; wxWindow* parent = GetParent() ;
while ( parent ) while ( parent )
{ {
if( parent->MacGetWindowData() ) if( parent->IsTopLevel() )
{ {
::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
break ; break ;
} }
@@ -624,13 +624,12 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
} }
} }
} }
::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
} }
} }
void wxToolBar::OnMouse( wxMouseEvent &event ) void wxToolBar::OnMouse( wxMouseEvent &event )
{ {
if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
{ {
@@ -643,7 +642,7 @@ void wxToolBar::OnMouse( wxMouseEvent &event )
Point localwhere ; Point localwhere ;
GrafPtr port ; GrafPtr port ;
SInt16 controlpart ; SInt16 controlpart ;
WindowRef window = GetMacRootWindow() ; WindowRef window = MacGetRootWindow() ;
localwhere.h = x ; localwhere.h = x ;
localwhere.v = y ; localwhere.v = y ;

11
src/mac/toolbar.cpp
View File

@@ -399,7 +399,7 @@ void wxToolBar::MacSuperChangedPosition()
int maxHeight = 0 ; int maxHeight = 0 ;
int toolcount = 0 ; int toolcount = 0 ;
{ {
WindowRef rootwindow = GetMacRootWindow() ; WindowRef rootwindow = MacGetRootWindow() ;
wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ; ::SetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
wxMacDrawingHelper focus( wxrootwindow ) ; wxMacDrawingHelper focus( wxrootwindow ) ;
@@ -594,9 +594,9 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
wxWindow* parent = GetParent() ; wxWindow* parent = GetParent() ;
while ( parent ) while ( parent )
{ {
if( parent->MacGetWindowData() ) if( parent->IsTopLevel() )
{ {
::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
break ; break ;
} }
@@ -624,13 +624,12 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
} }
} }
} }
::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; // ::SetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
} }
} }
void wxToolBar::OnMouse( wxMouseEvent &event ) void wxToolBar::OnMouse( wxMouseEvent &event )
{ {
if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
{ {
@@ -643,7 +642,7 @@ void wxToolBar::OnMouse( wxMouseEvent &event )
Point localwhere ; Point localwhere ;
GrafPtr port ; GrafPtr port ;
SInt16 controlpart ; SInt16 controlpart ;
WindowRef window = GetMacRootWindow() ; WindowRef window = MacGetRootWindow() ;
localwhere.h = x ; localwhere.h = x ;
localwhere.v = y ; localwhere.v = y ;