#include "wx/tooltip.h"
#include "wx/statusbr.h"
#include "wx/menuitem.h"
+#include "wx/spinctrl.h"
#include "wx/log.h"
#if wxUSE_CARET
#define MAC_SCROLLBAR_SIZE 16
#include "wx/mac/uma.h"
+#ifndef __DARWIN__
+#include <Windows.h>
+#include <ToolUtils.h>
+#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
m_hScrollBar = NULL ;
m_vScrollBar = NULL ;
+
+ m_label = wxEmptyString;
}
// Destructor
m_isBeingDeleted = TRUE;
+#ifndef __WXUNIVERSAL__
+ // VS: make sure there's no wxFrame with last focus set to us:
+ for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+ {
+ wxFrame *frame = wxDynamicCast(win, wxFrame);
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
+ {
+ frame->SetLastFocus((wxWindow*)NULL);
+ }
+ break;
+ }
+ }
+#endif // __WXUNIVERSAL__
+
if ( s_lastMouseWindow == this )
{
s_lastMouseWindow = NULL ;
wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
if ( control && control->GetMacControl() )
{
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlEditTextPart ) ;
+ UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ;
}
#endif
wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
return TRUE;
}
-void wxWindowMac::CaptureMouse()
+void wxWindowMac::DoCaptureMouse()
{
wxTheApp->s_captureWindow = this ;
}
return wxTheApp->s_captureWindow ;
}
-void wxWindowMac::ReleaseMouse()
+void wxWindowMac::DoReleaseMouse()
{
wxTheApp->s_captureWindow = NULL ;
}
if(x) *x = localwhere.h ;
if(y) *y = localwhere.v ;
- MacRootWindowToClient( x , y ) ;
+ MacRootWindowToWindow( x , y ) ;
+ if ( x )
+ x -= MacGetLeftBorderSize() ;
+ if ( y )
+ y -= MacGetTopBorderSize() ;
}
void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = (WindowRef) MacGetRootWindow() ;
- MacClientToRootWindow( x , y ) ;
+ if ( x )
+ x += MacGetLeftBorderSize() ;
+ if ( y )
+ y += MacGetTopBorderSize() ;
+
+ MacWindowToRootWindow( x , y ) ;
Point localwhere = { 0,0 };
if(x) localwhere.h = * x ;
return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
}
-void wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
- m_label = title ;
+ m_label = title ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
- return m_label ;
+ return m_label ;
}
bool wxWindowMac::Show(bool show)
if ( !wxWindowBase::Show(show) )
return FALSE;
+/*
+ WindowRef window = (WindowRef) MacGetRootWindow() ;
+ wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
+ if ( win == NULL && win->m_isBeingDeleted )
+ return FALSE ;
+*/
MacSuperShown( show ) ;
+ Refresh() ;
+/*
if ( !show )
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win && !win->m_isBeingDeleted )
Refresh() ;
}
{
Refresh() ;
}
-
+*/
return TRUE;
}
void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
if ( MacGetTopLevelWindow() == NULL )
- return ;
+ return ;
- wxPoint client ;
- client = GetClientAreaOrigin( ) ;
- Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+ wxPoint client = GetClientAreaOrigin();
+ int x1 = -client.x;
+ int y1 = -client.y;
+ int x2 = m_width - client.x;
+ int y2 = m_height - client.y;
+
+ if (IsKindOf( CLASSINFO(wxButton)))
+ {
+ // buttons have an "aura"
+ y1 -= 5;
+ x1 -= 5;
+ y2 += 5;
+ x2 += 5;
+ }
+
+ Rect clientrect = { y1, x1, y2, x2 };
+
if ( rect )
{
Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
SectRect( &clientrect , &r , &clientrect ) ;
}
+
if ( !EmptyRect( &clientrect ) )
{
int top = 0 , left = 0 ;
Rect extent = { 0 , 0 , 0 , 0 } ;
int x , y ;
x = y = 0 ;
- wxSize size = GetSize() ;
+ wxSize size = parent->GetSize() ;
parent->MacClientToRootWindow( &x , &y ) ;
extent.left = x ;
extent.top = y ;
if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
{
#if wxMAC_USE_THEME_BORDER
- Rect rect = { top , left , m_height + top , m_width + left } ;
- SInt32 border = 0 ;
- /*
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- InsetRect( &rect , border , border );
+ Rect rect = { top , left , m_height + top , m_width + left } ;
+ SInt32 border = 0 ;
+ /*
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ InsetRect( &rect , border , border );
DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
*/
DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
#else
- bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
+ bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
RGBForeColor( &face );
MoveTo( left + 0 , top + m_height - 2 );
LineTo( left + 0 , top + 0 );
}
else if (HasFlag(wxSIMPLE_BORDER))
{
- Rect rect = { top , left , m_height + top , m_width + left } ;
+ Rect rect = { top , left , m_height + top , m_width + left } ;
RGBForeColor( &black ) ;
FrameRect( &rect ) ;
}
}
+void wxWindowMac::RemoveChild( wxWindowBase *child )
+{
+ if ( child == m_hScrollBar )
+ m_hScrollBar = NULL ;
+ if ( child == m_vScrollBar )
+ m_vScrollBar = NULL ;
+
+ wxWindowBase::RemoveChild( child ) ;
+}
+
// New function that will replace some of the above.
void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{
WindowRef window ;
+
Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 )
{
- wxPoint point( screenpoint ) ;
+
wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
- point = win->ScreenToClient( point ) ;
+ // No, this yields the CLIENT are, we need the whole frame. RR.
+ // point = win->ScreenToClient( point ) ;
+
+ GrafPtr port;
+ ::GetPort( &port ) ;
+ ::SetPort( UMAGetWindowPort( window ) ) ;
+ ::GlobalToLocal( &pt ) ;
+ ::SetPort( port ) ;
+
+ wxPoint point( pt.h, pt.v ) ;
+
return win->MacGetWindowFromPointSub( point , outWin ) ;
}
}
}
extern int wxBusyCursorCount ;
+static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
{
return FALSE;
- if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) )
+ if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxSpinCtrl ) ))
return FALSE ;
WindowRef window = (WindowRef) MacGetRootWindow() ;
event.m_x = x ;
event.m_y = y ;
+ event.SetEventObject( this ) ;
if ( wxBusyCursorCount == 0 )
{
|| event.GetEventType() == wxEVT_LEAVE_WINDOW )
wxToolTip::RelayEvent( this , event);
#endif // wxUSE_TOOLTIPS
+
+ if (gs_lastWhich != this)
+ {
+ gs_lastWhich = this;
+
+ // Double clicks must always occur on the same window
+ if (event.GetEventType() == wxEVT_LEFT_DCLICK)
+ event.SetEventType( wxEVT_LEFT_DOWN );
+ if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
+ event.SetEventType( wxEVT_RIGHT_DOWN );
+
+ // Same for mouse up events
+ if (event.GetEventType() == wxEVT_LEFT_UP)
+ return TRUE;
+ if (event.GetEventType() == wxEVT_RIGHT_UP)
+ return TRUE;
+ }
+
GetEventHandler()->ProcessEvent( event ) ;
+
return TRUE;
}
{
wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ;
if ( win )
+ {
win->MacUpdate( 0 ) ;
+#if TARGET_API_MAC_CARBON
+ if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
+ {
+ QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
+ }
+#endif
+ }
}
wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
{
- SInt32 border = 3 ;
+ SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#if TARGET_CARBON
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
#endif
#endif
- return border ;
+ return border ;
}
else if ( m_windowStyle &wxDOUBLE_BORDER)
{
- SInt32 border = 3 ;
+ SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+#if TARGET_CARBON
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
#endif
#endif
- return border ;
+ return border ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
{
projects / wxWidgets.git / blobdiff