/////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp
-// Purpose: wxWindow
+// Purpose: wxWindowMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
#define wxWINDOW_VSCROLL 5997
#define MAC_SCROLLBAR_SIZE 16
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#include <string.h>
extern wxList wxPendingDelete;
-wxWindow* gFocusWindow = NULL ;
+wxWindowMac* gFocusWindow = NULL ;
+
+#ifdef __WXUNIVERSAL__
+ IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
+#else // __WXMAC__
+ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif // __WXUNIVERSAL__/__WXMAC__
#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
- EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
- EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindow::OnInitDialog)
- EVT_IDLE(wxWindow::OnIdle)
- EVT_SET_FOCUS(wxWindow::OnSetFocus)
+
+BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+ EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+ EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+ EVT_IDLE(wxWindowMac::OnIdle)
+ EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
END_EVENT_TABLE()
#endif
// ===========================================================================
// ---------------------------------------------------------------------------
-// wxWindow utility functions
+// wxWindowMac utility functions
// ---------------------------------------------------------------------------
// Find an item given the Macintosh Window Reference
wxList *wxWinMacWindowList = NULL;
-wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef)
{
wxNode *node = wxWinMacWindowList->Find((long)inWindowRef);
if (!node)
return NULL;
- return (wxWindow *)node->Data();
+ return (wxWindowMac *)node->Data();
}
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win)
+void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win)
{
// adding NULL WindowRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
wxWinMacWindowList->Append((long)inWindowRef, win);
}
-void wxRemoveMacWindowAssociation(wxWindow *win)
+void wxRemoveMacWindowAssociation(wxWindowMac *win)
{
wxWinMacWindowList->DeleteObject(win);
}
// constructors and such
// ----------------------------------------------------------------------------
-WindowRef wxWindow::s_macWindowInUpdate = NULL;
+WindowRef wxWindowMac::s_macWindowInUpdate = NULL;
-void wxWindow::Init()
+void wxWindowMac::Init()
{
// generic
InitBase();
}
// Destructor
-wxWindow::~wxWindow()
+wxWindowMac::~wxWindowMac()
{
// deleting a window while it is shown invalidates the region
if ( IsShown() ) {
- wxWindow* iter = this ;
+ wxWindowMac* iter = this ;
while( iter ) {
if ( iter->m_macWindowData )
{
}
// Constructor
-bool wxWindow::Create(wxWindow *parent, wxWindowID id,
+bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
+ wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE;
AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
m_width = WidthDefault( size.x );
m_height = HeightDefault( size.y ) ;
-
+#ifndef __WXUNIVERSAL__
if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
{
MacCreateScrollBars( style ) ;
}
-
+#endif
return TRUE;
}
-void wxWindow::SetFocus()
+void wxWindowMac::SetFocus()
{
if ( gFocusWindow == this )
return ;
gFocusWindow->m_caret->OnKillFocus();
}
#endif // wxUSE_CARET
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ;
control->MacRedrawControl() ;
}
+ #endif
wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
event.SetEventObject(gFocusWindow);
gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
}
#endif // wxUSE_CARET
// panel wants to track the window which was the last to have focus in it
- wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
- if ( panel )
- {
- panel->SetLastFocus(this);
- }
+ wxChildFocusEvent eventFocus(this);
+ (void)GetEventHandler()->ProcessEvent(eventFocus);
+
+ #ifndef __WXUNIVERSAL__
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ;
}
-
+ #endif
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
}
}
-bool wxWindow::Enable(bool enable)
+bool wxWindowMac::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
return FALSE;
wxWindowList::Node *node = GetChildren().GetFirst();
while ( node )
{
- wxWindow *child = node->GetData();
+ wxWindowMac *child = node->GetData();
child->Enable(enable);
node = node->GetNext();
return TRUE;
}
-void wxWindow::CaptureMouse()
+void wxWindowMac::CaptureMouse()
{
wxTheApp->s_captureWindow = this ;
}
return wxTheApp->s_captureWindow ;
}
-void wxWindow::ReleaseMouse()
+void wxWindowMac::ReleaseMouse()
{
wxTheApp->s_captureWindow = NULL ;
}
#if wxUSE_DRAG_AND_DROP
-void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
if ( m_pDropTarget != 0 ) {
delete m_pDropTarget;
#endif
// Old style file-manager drag&drop
-void wxWindow::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool accept)
{
// TODO
}
// Get total size
-void wxWindow::DoGetSize(int *x, int *y) const
+void wxWindowMac::DoGetSize(int *x, int *y) const
{
- *x = m_width ;
- *y = m_height ;
+ if(x) *x = m_width ;
+ if(y) *y = m_height ;
}
-void wxWindow::DoGetPosition(int *x, int *y) const
+void wxWindowMac::DoGetPosition(int *x, int *y) const
{
- *x = m_x ;
- *y = m_y ;
+ int xx,yy;
+
+ xx = m_x ;
+ yy = m_y ;
if (GetParent())
{
wxPoint pt(GetParent()->GetClientAreaOrigin());
- *x -= pt.x;
- *y -= pt.y;
+ xx -= pt.x;
+ yy -= pt.y;
}
+ if(x) *x = xx;
+ if(y) *y = yy;
}
-
-bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
menu->SetInvokingWindow(this);
menu->UpdateUI();
return TRUE;
}
+#endif
-void wxWindow::DoScreenToClient(int *x, int *y) const
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
- Point localwhere ;
- localwhere.h = * x ;
- localwhere.v = * y ;
+ Point localwhere = {0,0} ;
+
+ if(x) localwhere.h = * x ;
+ if(y) localwhere.v = * y ;
GrafPtr port ;
::GetPort( &port ) ;
::GlobalToLocal( &localwhere ) ;
::SetPort( port ) ;
- *x = localwhere.h ;
- *y = localwhere.v ;
+ if(x) *x = localwhere.h ;
+ if(y) *y = localwhere.v ;
MacRootWindowToClient( x , y ) ;
}
-void wxWindow::DoClientToScreen(int *x, int *y) const
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = GetMacRootWindow() ;
MacClientToRootWindow( x , y ) ;
- Point localwhere ;
- localwhere.h = * x ;
- localwhere.v = * y ;
+ Point localwhere = { 0,0 };
+ if(x) localwhere.h = * x ;
+ if(y) localwhere.v = * y ;
GrafPtr port ;
::GetPort( &port ) ;
::SetOrigin( 0 , 0 ) ;
::LocalToGlobal( &localwhere ) ;
::SetPort( port ) ;
- *x = localwhere.h ;
- *y = localwhere.v ;
+ if(x) *x = localwhere.h ;
+ if(y) *y = localwhere.v ;
}
-void wxWindow::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
{
- if ( m_macWindowData )
- {
- }
- else
+ if ( m_macWindowData == NULL)
{
- *x += m_x ;
- *y += m_y ;
+ if(x) *x += m_x + MacGetLeftBorderSize();
+ if(y) *y += m_y + MacGetTopBorderSize();
GetParent()->MacClientToRootWindow( x , y ) ;
}
}
-void wxWindow::MacRootWindowToClient( int *x , int *y ) const
+void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
{
- if ( m_macWindowData )
- {
- }
- else
+ if ( m_macWindowData == NULL)
{
- *x -= m_x ;
- *y -= m_y ;
+ if(x) *x -= m_x + MacGetLeftBorderSize();
+ if(y) *y -= m_y + MacGetTopBorderSize();
GetParent()->MacRootWindowToClient( x , y ) ;
}
}
-bool wxWindow::SetCursor(const wxCursor& cursor)
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
{
if (m_cursor == cursor)
return FALSE;
wxT("cursor must be valid after call to the base version"));
Point pt ;
- wxWindow *mouseWin ;
+ wxWindowMac *mouseWin ;
GetMouse( &pt ) ;
// Change the cursor NOW if we're within the correct window
// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindow::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
{
- *x = m_width ;
- *y = m_height ;
+ int ww, hh;
+ ww = m_width ;
+ hh = m_height ;
- *x -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- *y -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
+ ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
+ hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
{
MacClientToRootWindow( &x1 , &y1 ) ;
MacClientToRootWindow( &w , &h ) ;
- WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
if (m_hScrollBar && m_hScrollBar->IsShown() )
{
- (*y) -= MAC_SCROLLBAR_SIZE;
+ hh -= MAC_SCROLLBAR_SIZE;
if ( h-y1 >= totH )
{
- (*y)+= 1 ;
+ hh += 1 ;
}
}
if (m_vScrollBar && m_vScrollBar->IsShown() )
{
- (*x) -= MAC_SCROLLBAR_SIZE;
+ ww -= MAC_SCROLLBAR_SIZE;
if ( w-x1 >= totW )
{
- (*x) += 1 ;
+ ww += 1 ;
}
}
}
+ if(x) *x = ww;
+ if(y) *y = hh;
}
#if wxUSE_TOOLTIPS
-void wxWindow::DoSetToolTip(wxToolTip *tooltip)
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{
wxWindowBase::DoSetToolTip(tooltip);
#endif // wxUSE_TOOLTIPS
-void wxWindow::DoMoveWindow(int x, int y, int width, int height)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
- DoSetSize( x,y, width, height ) ;
-}
-
-// set the size of the window: if the dimensions are positive, just use them,
-// but if any of them is equal to -1, it means that we must find the value for
-// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
-// which case -1 is a valid value for x and y)
-//
-// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
-// the width/height to best suit our contents, otherwise we reuse the current
-// width/height
-void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-
int former_x = m_x ;
int former_y = m_y ;
int former_w = m_width ;
int former_h = m_height ;
- int currentX, currentY;
- GetPosition(¤tX, ¤tY);
- int currentW,currentH;
- GetSize(¤tW, ¤tH);
-
int actualWidth = width;
int actualHeight = height;
int actualX = x;
int actualY = y;
- if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- actualX = currentX;
- if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- actualY = currentY;
-
- wxSize size( -1 , -1 ) ;
- if (width == -1 || height == -1 )
- {
- size = DoGetBestSize() ;
- }
-
- if ( width == -1 )
- {
- if ( sizeFlags & wxSIZE_AUTO_WIDTH )
- {
- actualWidth = size.x ;
- if ( actualWidth == -1 )
- actualWidth = 80 ;
- }
- else
- {
- actualWidth = currentW ;
- }
- }
- if (height == -1)
- {
- if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
- {
- actualHeight = size.y ;
- if ( actualHeight == -1 )
- actualHeight = 26 ;
- }
- else
- {
- actualHeight = currentH ;
- }
- }
-
if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight;
- if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH)
- {
- MacRepositionScrollBars() ; // we might have a real position shift
- return ;
- }
- AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
-
-
bool doMove = false ;
bool doResize = false ;
frame->PositionStatusBar();
frame->PositionToolBar();
}
+ if ( doMove )
+ wxWindowMac::MacTopLevelWindowChangedPosition() ; // like this only children will be notified
}
else
{
}
if ( doMove )
- wxWindow::MacSuperChangedPosition() ; // like this only children will be notified
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
}
MacRepositionScrollBars() ;
if ( doMove )
}
if ( doResize )
{
- MacRepositionScrollBars() ;
- wxSize size(m_width, m_height);
- wxSizeEvent event(size, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ MacRepositionScrollBars() ;
+ wxSize size(m_width, m_height);
+ wxSizeEvent event(size, m_windowId);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
}
}
+
+}
+
+// set the size of the window: if the dimensions are positive, just use them,
+// but if any of them is equal to -1, it means that we must find the value for
+// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+ // get the current size and position...
+ int currentX, currentY;
+ GetPosition(¤tX, ¤tY);
+ int currentW,currentH;
+ GetSize(¤tW, ¤tH);
+
+ // ... and don't do anything (avoiding flicker) if it's already ok
+ if ( x == currentX && y == currentY &&
+ width == currentW && height == currentH )
+ {
+ MacRepositionScrollBars() ; // we might have a real position shift
+ return;
+ }
+
+ if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+ x = currentX;
+ if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+ y = currentY;
+
+ AdjustForParentClientOrigin(x, y, sizeFlags);
+
+ wxSize size(-1, -1);
+ if ( width == -1 )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+ {
+ size = DoGetBestSize();
+ width = size.x;
+ }
+ else
+ {
+ // just take the current one
+ width = currentW;
+ }
+ }
+
+ if ( height == -1 )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+ {
+ if ( size.x == -1 )
+ {
+ size = DoGetBestSize();
+ }
+ //else: already called DoGetBestSize() above
+
+ height = size.y;
+ }
+ else
+ {
+ // just take the current one
+ height = currentH;
+ }
+ }
+
+ DoMoveWindow(x, y, width, height);
+
}
// For implementation purposes - sometimes decorations make the client area
// smaller
-wxPoint wxWindow::GetClientAreaOrigin() const
+wxPoint wxWindowMac::GetClientAreaOrigin() const
{
return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
}
// Makes an adjustment to the window position (for example, a frame that has
// a toolbar that it manages itself).
-void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
{
if( !m_macWindowData )
{
}
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
m_label = title ;
UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
return m_label ;
}
-bool wxWindow::Show(bool show)
+bool wxWindowMac::Show(bool show)
{
if ( !wxWindowBase::Show(show) )
return FALSE;
{
if (show)
{
- UMAShowWindow( m_macWindowData->m_macWindow ) ;
- UMASelectWindow( m_macWindowData->m_macWindow ) ;
+ ::ShowWindow( m_macWindowData->m_macWindow ) ;
+ ::SelectWindow( m_macWindowData->m_macWindow ) ;
// no need to generate events here, they will get them triggered by macos
// actually they should be , but apparently they are not
wxSize size(m_width, m_height);
}
else
{
- UMAHideWindow( m_macWindowData->m_macWindow ) ;
+ ::HideWindow( m_macWindowData->m_macWindow ) ;
}
}
MacSuperShown( show ) ;
if ( !show )
{
WindowRef window = GetMacRootWindow() ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
- if ( !win->m_isBeingDeleted )
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+ if ( win && !win->m_isBeingDeleted )
Refresh() ;
}
else
return TRUE;
}
-void wxWindow::MacSuperShown( bool show )
+void wxWindowMac::MacSuperShown( bool show )
{
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
if ( child->m_isShown )
child->MacSuperShown( show ) ;
node = node->Next();
}
}
-bool wxWindow::MacIsReallyShown() const
+bool wxWindowMac::MacIsReallyShown() const
{
if ( m_isShown && (m_parent != NULL) ) {
return m_parent->MacIsReallyShown();
return m_isShown;
/*
bool status = m_isShown ;
- wxWindow * win = this ;
+ wxWindowMac * win = this ;
while ( status && win->m_parent != NULL )
{
win = win->m_parent ;
*/
}
-int wxWindow::GetCharHeight() const
+int wxWindowMac::GetCharHeight() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharHeight() ;
}
-int wxWindow::GetCharWidth() const
+int wxWindowMac::GetCharWidth() const
{
- wxClientDC dc ( (wxWindow*)this ) ;
+ wxClientDC dc ( (wxWindowMac*)this ) ;
return dc.GetCharWidth() ;
}
-void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
int *descent, int *externalLeading, const wxFont *theFont ) const
{
const wxFont *fontToUse = theFont;
if ( !fontToUse )
fontToUse = &m_font;
- wxClientDC dc( (wxWindow*) this ) ;
+ wxClientDC dc( (wxWindowMac*) this ) ;
long lx,ly,ld,le ;
dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
if ( externalLeading )
*y = ly ;
}
-void wxWindow::MacEraseBackground( Rect *rect )
+void wxWindowMac::MacEraseBackground( Rect *rect )
{
/*
WindowRef window = GetMacRootWindow() ;
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ;
SectRect( &clientrect , rect , &clientrect ) ;
*/
}
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
// if ( !IsShown() )
// return ;
- wxMacDrawingHelper focus( this ) ;
+ wxMacDrawingClientHelper focus( this ) ;
if ( focus.Ok() )
{
- Rect clientrect = { 0 , 0 , m_height , m_width } ;
+ wxPoint client ;
+ client = GetClientAreaOrigin( ) ;
+ Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
// ClipRect( &clientrect ) ;
if ( rect )
}
// Responds to colour changes: passes event on to children.
-void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
wxNode *node = GetChildren().First();
while ( node )
{
// Only propagate to non-top-level windows
- wxWindow *win = (wxWindow *)node->Data();
+ wxWindowMac *win = (wxWindowMac *)node->Data();
if ( win->GetParent() )
{
wxSysColourChangedEvent event2;
// Caret manipulation
// ---------------------------------------------------------------------------
-void wxWindow::CreateCaret(int w, int h)
+void wxWindowMac::CreateCaret(int w, int h)
{
SetCaret(new wxCaret(this, w, h));
}
-void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
{
wxFAIL_MSG("not implemented");
}
-void wxWindow::ShowCaret(bool show)
+void wxWindowMac::ShowCaret(bool show)
{
wxCHECK_RET( m_caret, "no caret to show" );
m_caret->Show(show);
}
-void wxWindow::DestroyCaret()
+void wxWindowMac::DestroyCaret()
{
SetCaret(NULL);
}
-void wxWindow::SetCaretPos(int x, int y)
+void wxWindowMac::SetCaretPos(int x, int y)
{
wxCHECK_RET( m_caret, "no caret to move" );
m_caret->Move(x, y);
}
-void wxWindow::GetCaretPos(int *x, int *y) const
+void wxWindowMac::GetCaretPos(int *x, int *y) const
{
wxCHECK_RET( m_caret, "no caret to get position of" );
}
#endif // wxUSE_CARET
-wxWindow *wxGetActiveWindow()
+wxWindowMac *wxGetActiveWindow()
{
// actually this is a windows-only concept
return NULL;
}
// Coordinates relative to the window
-void wxWindow::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer (int x_pos, int y_pos)
{
// We really dont move the mouse programmatically under mac
}
-void wxWindow::OnEraseBackground(wxEraseEvent& event)
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
// TODO : probably we would adopt the EraseEvent structure
}
-int wxWindow::GetScrollPos(int orient) const
+int wxWindowMac::GetScrollPos(int orient) const
{
if ( orient == wxHORIZONTAL )
{
// This now returns the whole range, not just the number
// of positions that we can scroll.
-int wxWindow::GetScrollRange(int orient) const
+int wxWindowMac::GetScrollRange(int orient) const
{
if ( orient == wxHORIZONTAL )
{
return 0;
}
-int wxWindow::GetScrollThumb(int orient) const
+int wxWindowMac::GetScrollThumb(int orient) const
{
if ( orient == wxHORIZONTAL )
{
return 0;
}
-void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
{
if ( orient == wxHORIZONTAL )
{
}
}
-void wxWindow::MacCreateRealWindow( const wxString& title,
+void wxWindowMac::MacCreateRealWindow( const wxString& title,
const wxPoint& pos,
const wxSize& size,
long style,
attr |= kWindowCloseBoxAttribute ;
}
- UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
+ ::CreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
wxString label ;
if( wxApp::s_macDefaultEncodingIsPC )
else
label = title ;
UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
- UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
+ ::CreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
m_macWindowData->m_macFocus = NULL ;
m_macWindowData->m_macHasReceivedFirstActivate = true ;
}
-void wxWindow::MacPaint( wxPaintEvent &event )
+void wxWindowMac::MacPaint( wxPaintEvent &event )
{
}
-void wxWindow::MacPaintBorders( )
+void wxWindowMac::MacPaintBorders( )
{
if( m_macWindowData )
return ;
if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
{
bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
- RGBColor pen1 = sunken ? white : black ;
- RGBColor pen2 = sunken ? shadow : face ;
- RGBColor pen3 = sunken ? face : shadow ;
- RGBColor pen4 = sunken ? black : white ;
-
- RGBForeColor( &pen1 ) ;
- {
- Rect rect = { 0 , 0 , m_height , m_width } ;
- FrameRect( &rect ) ;
- }
- RGBForeColor( &pen2 ) ;
- {
- Rect rect = { 1 , 1 , m_height -1 , m_width -1} ;
- FrameRect( &rect ) ;
- }
- RGBForeColor( &pen3 ) ;
- {
- Rect rect = { 0 , 0 , m_height -2 , m_width -2} ;
- FrameRect( &rect ) ;
- }
- RGBForeColor( &pen4 ) ;
- {
- MoveTo( 0 , 0 ) ;
- LineTo( m_width - 3 , 0 ) ;
- MoveTo( 0 , 0 ) ;
- LineTo( 0 , m_height - 3 ) ;
- }
+ RGBForeColor( &face );
+ MoveTo( 0 , m_height - 2 );
+ LineTo( 0 , 0 );
+ LineTo( m_width - 2 , 0 );
+
+ MoveTo( 2 , m_height - 3 );
+ LineTo( m_width - 3 , m_height - 3 );
+ LineTo( m_width - 3 , 2 );
+
+ RGBForeColor( sunken ? &face : &black );
+ MoveTo( 0 , m_height - 1 );
+ LineTo( m_width - 1 , m_height - 1 );
+ LineTo( m_width - 1 , 0 );
+
+ RGBForeColor( sunken ? &shadow : &white );
+ MoveTo( 1 , m_height - 3 );
+ LineTo( 1, 1 );
+ LineTo( m_width - 3 , 1 );
+
+ RGBForeColor( sunken ? &white : &shadow );
+ MoveTo( 1 , m_height - 2 );
+ LineTo( m_width - 2 , m_height - 2 );
+ LineTo( m_width - 2 , 1 );
+
+ RGBForeColor( sunken ? &black : &face );
+ MoveTo( 2 , m_height - 4 );
+ LineTo( 2 , 2 );
+ LineTo( m_width - 4 , 2 );
}
else if (HasFlag(wxSIMPLE_BORDER))
{
RGBForeColor( &black ) ;
FrameRect( &rect ) ;
}
-/*
- if ( this->GetParent() )
- {
- wxPaintDC dc(GetParent());
- GetParent()->PrepareDC(dc);
-
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) )
- {
- bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-
- wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ;
- wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ;
-
- wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN;
- wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow;
- wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow;
- wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN;
-
- dc.SetPen(wxPen1);
- dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button
-
- dc.SetPen(wxPen2);
- dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top
-
- dc.SetPen(wxPen3);
- dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button
-
- dc.SetPen(wxPen4);
- dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top
- dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3);
- }
- else if (HasFlag(wxDOUBLE_BORDER))
- {
- bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
-
- wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ;
- wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ;
-
- wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN;
- wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow;
- wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow;
- wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN;
-
- dc.SetPen(wxPen1);
- dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button
-
- dc.SetPen(wxPen2);
- dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top
-
- dc.SetPen(wxPen3);
- dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button
-
- dc.SetPen(wxPen4);
- dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top
- dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3);
- }
- else if (HasFlag(wxSIMPLE_BORDER))
- {
- dc.SetPen(*wxBLACK_PEN);
- dc.DrawRectangle(m_x, m_y, m_width, m_height);
- }
- }
- */
}
// New function that will replace some of the above.
-void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
{
if ( orient == wxHORIZONTAL )
}
// Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
wxMacDrawingClientHelper focus( this ) ;
if ( focus.Ok() )
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
}
-void wxWindow::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll(wxScrollEvent &event )
{
if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar )
{
}
}
-bool wxWindow::SetFont(const wxFont& font)
+bool wxWindowMac::SetFont(const wxFont& font)
{
if ( !wxWindowBase::SetFont(font) )
{
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindowMac *wxWindowBase::FindFocus()
{
return gFocusWindow ;
}
// If nothing defined for this, try the parent.
// E.g. we may be a button loaded from a resource, with no callback function
// defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
+void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
{
if ( GetEventHandler()->ProcessEvent(event) )
return;
#endif // WXWIN_COMPATIBILITY_2
#if WXWIN_COMPATIBILITY
-wxObject* wxWindow::GetChild(int number) const
+wxObject* wxWindowMac::GetChild(int number) const
{
// Return a pointer to the Nth object in the Panel
wxNode *node = GetChildren().First();
}
#endif // WXWIN_COMPATIBILITY
-void wxWindow::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus(wxFocusEvent& event)
{
// panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
// notice that it's also important to do it upwards the tree becaus
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
- wxWindow *win = this;
- while ( win )
- {
- wxWindow *parent = win->GetParent();
- wxPanel *panel = wxDynamicCast(parent, wxPanel);
- if ( panel )
- {
- panel->SetLastFocus(win);
- }
-
- win = parent;
- }
+
+ // CS:don't know if this is still needed:
+ //wxChildFocusEvent eventFocus(this);
+ //(void)GetEventHandler()->ProcessEvent(eventFocus);
event.Skip();
}
-void wxWindow::Clear()
+void wxWindowMac::Clear()
{
if ( m_macWindowData )
{
int w ,h ;
wxPoint origin = GetClientAreaOrigin() ;
GetClientSize( &w , &h ) ;
- UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+ ::SetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ;
Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
EraseRect( &r ) ;
}
}
// Setup background and foreground colours correctly
-void wxWindow::SetupColours()
+void wxWindowMac::SetupColours()
{
if ( GetParent() )
SetBackgroundColour(GetParent()->GetBackgroundColour());
}
-void wxWindow::OnIdle(wxIdleEvent& event)
+void wxWindowMac::OnIdle(wxIdleEvent& event)
{
/*
// Check if we need to send a LEAVE event
}
// Raise the window to the top of the Z order
-void wxWindow::Raise()
+void wxWindowMac::Raise()
{
if ( m_macWindowData )
{
- UMABringToFront( m_macWindowData->m_macWindow ) ;
+ ::BringToFront( m_macWindowData->m_macWindow ) ;
}
}
// Lower the window to the bottom of the Z order
-void wxWindow::Lower()
+void wxWindowMac::Lower()
{
if ( m_macWindowData )
{
- UMASendBehind( m_macWindowData->m_macWindow , NULL ) ;
+ ::SendBehind( m_macWindowData->m_macWindow , NULL ) ;
}
}
-void wxWindow::DoSetClientSize(int width, int height)
+void wxWindowMac::DoSetClientSize(int width, int height)
{
if ( width != -1 || height != -1 )
{
}
-wxWindow* wxWindow::s_lastMouseWindow = NULL ;
+wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
{
if ((point.x < m_x) || (point.y < m_y) ||
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// added the m_isShown test --dmazzoni
if ( child->GetMacRootWindow() == window && child->m_isShown )
{
return TRUE;
}
-bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin )
+bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{
WindowRef window ;
Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 )
{
wxPoint point( screenpoint ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
win->ScreenToClient( point ) ;
extern int wxBusyCursorCount ;
-bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event)
+bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
{
if ((event.m_x < m_x) || (event.m_y < m_y) ||
(event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() )
{
if (child->MacDispatchMouseEvent(event))
Point lastWhere ;
long lastWhen = 0 ;
-wxString wxWindow::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
if ( m_tooltip )
{
}
return "" ;
}
-void wxWindow::MacFireMouseEvent( EventRecord *ev )
+void wxWindowMac::MacFireMouseEvent( EventRecord *ev )
{
wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
}
}
-void wxWindow::MacMouseDown( EventRecord *ev , short part)
+void wxWindowMac::MacMouseDown( EventRecord *ev , short part)
{
MacFireMouseEvent( ev ) ;
}
-void wxWindow::MacMouseUp( EventRecord *ev , short part)
+void wxWindowMac::MacMouseUp( EventRecord *ev , short part)
{
- WindowPtr frontWindow ;
switch (part)
{
case inContent:
}
}
-void wxWindow::MacMouseMoved( EventRecord *ev , short part)
+void wxWindowMac::MacMouseMoved( EventRecord *ev , short part)
{
- WindowPtr frontWindow ;
switch (part)
{
case inContent:
break ;
}
}
-void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating )
+void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating )
{
if ( !m_macWindowData->m_macHasReceivedFirstActivate )
m_macWindowData->m_macHasReceivedFirstActivate = true ;
// MacUpdateImmediately() ;
}
-void wxWindow::MacRedraw( RgnHandle updatergn , long time)
+void wxWindowMac::MacRedraw( RgnHandle updatergn , long time)
{
// updatergn is always already clipped to our boundaries
WindowRef window = GetMacRootWindow() ;
// ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children
RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ;
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+
{
wxMacDrawingHelper focus( this ) ; // was client
if ( focus.Ok() )
eraseBackground = true ;
if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) )
{
- UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
+ ::SetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ;
}
else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) )
{
// either a non gray background color or a non control window
- wxWindow* parent = GetParent() ;
+ wxWindowMac* parent = GetParent() ;
while( parent )
{
if ( parent->GetMacRootWindow() != window )
{
Rect box ;
GetRegionBounds( updatergn , &box) ;
- UMAApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
+ ::ApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true);
break ;
}
}
if ( !parent )
{
// if there is nothing special -> use default
- UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
+ ::SetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ;
}
}
else
RgnHandle childarea = NewRgn() ;
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
// eventually test for transparent windows
if ( child->GetMacRootWindow() == window && child->IsShown() )
{
for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
- wxWindow *child = (wxWindow*)node->Data();
+ wxWindowMac *child = (wxWindowMac*)node->Data();
SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
SectRgn( childupdate , updatergn , childupdate ) ;
OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
// eventually a draw grow box here
}
-void wxWindow::MacUpdateImmediately()
+void wxWindowMac::MacUpdateImmediately()
{
WindowRef window = GetMacRootWindow() ;
if ( window )
{
- wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
}
}
-void wxWindow::MacUpdate( EventRecord *ev )
+void wxWindowMac::MacUpdate( EventRecord *ev )
{
WindowRef window = (WindowRef) ev->message ;
- wxWindow * win = wxFindWinFromMacWindow( window ) ;
+ wxWindowMac * win = wxFindWinFromMacWindow( window ) ;
#if TARGET_CARBON
AGAPortHelper help( GetWindowPort(window) ) ;
#else
EndUpdate( window ) ;
}
-WindowRef wxWindow::GetMacRootWindow() const
+WindowRef wxWindowMac::GetMacRootWindow() const
{
- WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
while( iter )
{
return NULL ;
}
-void wxWindow::MacCreateScrollBars( long style )
+void wxWindowMac::MacCreateScrollBars( long style )
{
wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
MacRepositionScrollBars() ; // we might have a real position shift
}
-void wxWindow::MacRepositionScrollBars()
+void wxWindowMac::MacRepositionScrollBars()
{
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
MacClientToRootWindow( &x , &y ) ;
MacClientToRootWindow( &w , &h ) ;
- WindowRef window = NULL ;
- wxWindow *iter = (wxWindow*)this ;
+ wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
while( iter )
}
}
-void wxWindow::MacKeyDown( EventRecord *ev )
+void wxWindowMac::MacKeyDown( EventRecord *ev )
{
}
-bool wxWindow::AcceptsFocus() const
+bool wxWindowMac::AcceptsFocus() const
{
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-ControlHandle wxWindow::MacGetContainerForEmbedding()
+ControlHandle wxWindowMac::MacGetContainerForEmbedding()
{
if ( m_macWindowData )
return m_macWindowData->m_macRootControl ;
return GetParent()->MacGetContainerForEmbedding() ;
}
-void wxWindow::MacSuperChangedPosition()
+void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
wxNode *node = GetChildren().First();
while ( node )
{
- wxWindow *child = (wxWindow *)node->Data();
+ wxWindowMac *child = (wxWindowMac *)node->Data();
child->MacSuperChangedPosition() ;
node = node->Next();
}
}
-bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+void wxWindowMac::MacTopLevelWindowChangedPosition()
+{
+ // only screen-absolute structures have to be moved i.e. glcanvas
+
+ wxNode *node = GetChildren().First();
+ while ( node )
+ {
+ wxWindowMac *child = (wxWindowMac *)node->Data();
+ child->MacTopLevelWindowChangedPosition() ;
+ node = node->Next();
+ }
+}
+
+bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
return true;
}
-bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win )
+bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win )
{
if ( window == NULL )
return false ;
Pattern whiteColor ;
::BackPat( GetQDGlobalsWhite( &whiteColor) ) ;
- ::UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+ ::SetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ;
return true;
}
-void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin)
+void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin)
{
if ( m_macWindowData )
{
}
}
-void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
// int width , height ;
// GetClientSize( &width , &height ) ;
}
}
-void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin )
+void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin )
{
MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ;
SectRect(clipRect, &myClip, clipRect);
}
-long wxWindow::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
{
- return 2 ;
+ return 3 ;
}
else if ( m_windowStyle &wxDOUBLE_BORDER)
{
- return 2 ;
+ return 3 ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
{
return 0 ;
}
-long wxWindow::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
{
- return 3 ;
+ return 1 ;
}
return 0 ;
}
-long wxWindow::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
{
- return 2 ;
+ return 3 ;
}
else if ( m_windowStyle &wxDOUBLE_BORDER)
{
- return 2 ;
+ return 3 ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
{
return 0 ;
}
-long wxWindow::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize( ) const
{
if( m_macWindowData )
return 0 ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
{
- return 3 ;
+ return 1 ;
}
return 0 ;
}
-long wxWindow::MacRemoveBordersFromStyle( long style )
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
}
-wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow )
+wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
SetPort( m_formerPort ) ;
}
-wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow )
+wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow )
{
m_ok = false ;
Point localOrigin ;
Rect clipRect ;
WindowRef window ;
- wxWindow *rootwin ;
+ wxWindowMac *rootwin ;
m_currentPort = NULL ;
GetPort( &m_formerPort ) ;
SetPort( m_formerPort ) ;
}
-// Find the wxWindow at the current mouse position, returning the mouse
+// Find the wxWindowMac at the current mouse position, returning the mouse
// position.
-wxWindow* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
{
pt = wxGetMousePosition();
- wxWindow* found = wxFindWindowAtPoint(pt);
+ wxWindowMac* found = wxFindWindowAtPoint(pt);
return found;
}
projects / wxWidgets.git / blobdiff