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

Shaped window support for wxMac, plus a wxSTAY_ON_TOP fix from Egon

Browse Source 
<e_lub@yahoo.com>   wxMac requires knowledge before Create that SetShape
will be called so I also added the wxFRAME_SHAPED style flag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-30 00:39:15 +00:00
parent e2a07240ee
commit a16bcfcef2
12 changed files with 528 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/frame.tex
View File

@@ -55,6 +55,8 @@ you should use
{\tt wxDEFAULT\_FRAME\_STYLE \& (wxMINIMIZE\_BOX | wxMAXIMIZE\_BOX)} for the {\tt wxDEFAULT\_FRAME\_STYLE \& (wxMINIMIZE\_BOX | wxMAXIMIZE\_BOX)} for the
frames having this style (the dialogs don't have minimize nor maximize box by frames having this style (the dialogs don't have minimize nor maximize box by
default)} default)}
\twocolitem{\windowstyle{wxFRAME\_SHAPED}}{Windows with this style are
allowed to have their shape changed with the \helpref{SetShape}{wxframesetshape} method.}
\end{twocollist} \end{twocollist}
The default frame style is for normal, resizeable frames. To create a frame The default frame style is for normal, resizeable frames. To create a frame

1
include/wx/defs.h
View File

@@ -990,6 +990,7 @@ enum wxBorder
#define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only) #define wxFRAME_NO_TASKBAR 0x0002 // No taskbar button (MSW only)
#define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu #define wxFRAME_TOOL_WINDOW 0x0004 // No taskbar button, no system menu
#define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent #define wxFRAME_FLOAT_ON_PARENT 0x0008 // Always above its parent
#define wxFRAME_SHAPED 0x0010 // Create a window that is able to be shaped
// deprecated versions defined for compatibility reasons // deprecated versions defined for compatibility reasons
#define wxRESIZE_BOX wxMAXIMIZE_BOX #define wxRESIZE_BOX wxMAXIMIZE_BOX

29
samples/shaped/shaped.cpp
View File

@@ -39,6 +39,7 @@
#include "wx/menu.h" #include "wx/menu.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/image.h"
#endif #endif
#include "wx/dcclient.h" #include "wx/dcclient.h"
@@ -133,6 +134,7 @@ bool MyApp::OnInit()
// Create the main application window // Create the main application window
ShapedFrame *frame = new ShapedFrame(); ShapedFrame *frame = new ShapedFrame();
frame->Show(TRUE); frame->Show(TRUE);
SetTopWindow(frame);
// success: wxApp::OnRun() will be called which will enter the main message // success: wxApp::OnRun() will be called which will enter the main message
// loop and the application will run. If we returned FALSE here, the // loop and the application will run. If we returned FALSE here, the
@@ -147,17 +149,26 @@ bool MyApp::OnInit()
// frame constructor // frame constructor
ShapedFrame::ShapedFrame() ShapedFrame::ShapedFrame()
: wxFrame((wxFrame *)NULL, -1, wxEmptyString, : wxFrame((wxFrame *)NULL, -1, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxSize(100, 100), //wxDefaultSize,
wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR) 0
| wxFRAME_SHAPED
| wxSIMPLE_BORDER
| wxFRAME_NO_TASKBAR
| wxSTAY_ON_TOP
)
{ {
m_hasShape = FALSE; m_hasShape = FALSE;
m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG); m_bmp = wxBitmap("star.png", wxBITMAP_TYPE_PNG);
SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight())); SetSize(wxSize(m_bmp.GetWidth(), m_bmp.GetHeight()));
#ifndef __WXMAC__
// On wxMac the tooltip gets clipped by the window shape, YUCK!!
SetToolTip(wxT("Right-click to exit")); SetToolTip(wxT("Right-click to exit"));
#ifdef __wxMSW__ #endif
#ifndef __WXGTK__
// On wxGTK we can't do this yet because the window hasn't been created // On wxGTK we can't do this yet because the window hasn't been created
// yet so we wait until the EVT_WINDOW_CREATE event happens. On wxMSW it // yet so we wait until the EVT_WINDOW_CREATE event happens. On wxMSW and
// has been created so we set the shape now. // wxMac the window has been created at this point so we go ahead and set
// the shape now.
SetWindowShape(); SetWindowShape();
#endif #endif
} }
@@ -183,6 +194,7 @@ void ShapedFrame::OnDoubleClick(wxMouseEvent& evt)
void ShapedFrame::OnLeftDown(wxMouseEvent& evt) void ShapedFrame::OnLeftDown(wxMouseEvent& evt)
{ {
CaptureMouse(); CaptureMouse();
//printf("Mouse captured\n");
wxPoint pos = ClientToScreen(evt.GetPosition()); wxPoint pos = ClientToScreen(evt.GetPosition());
wxPoint origin = GetPosition(); wxPoint origin = GetPosition();
int dx = pos.x - origin.x; int dx = pos.x - origin.x;
@@ -193,14 +205,19 @@ void ShapedFrame::OnLeftDown(wxMouseEvent& evt)
void ShapedFrame::OnLeftUp(wxMouseEvent& evt) void ShapedFrame::OnLeftUp(wxMouseEvent& evt)
{ {
if (HasCapture()) if (HasCapture())
{
ReleaseMouse(); ReleaseMouse();
//printf("Mouse released\n");
}
} }
void ShapedFrame::OnMouseMove(wxMouseEvent& evt) void ShapedFrame::OnMouseMove(wxMouseEvent& evt)
{ {
wxPoint pt = evt.GetPosition();
//printf("x:%d y:%d\n", pt.x, pt.y);
if (evt.Dragging() && evt.LeftIsDown()) if (evt.Dragging() && evt.LeftIsDown())
{ {
wxPoint pos = ClientToScreen(evt.GetPosition()); wxPoint pos = ClientToScreen(pt);
Move(wxPoint(pos.x - m_delta.x, pos.y - m_delta.y)); Move(wxPoint(pos.x - m_delta.x, pos.y - m_delta.y));
} }
} }

11
src/gtk/toplevel.cpp
View File

@@ -506,10 +506,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
m_fsIsShowing = show; m_fsIsShowing = show;
GdkWindow *window = m_widget->window; GdkWindow *window = m_widget->window;
wxX11FullScreenMethod method = wxX11FullScreenMethod method =
wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW()); (WXWindow)GDK_ROOT_WINDOW());
if (show) if (show)
{ {
m_fsSaveFlag = style; m_fsSaveFlag = style;
@@ -531,7 +531,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gdk_window_set_decorations(window, (GdkWMDecoration)0); gdk_window_set_decorations(window, (GdkWMDecoration)0);
gdk_window_set_functions(window, (GdkWMFunction)0); gdk_window_set_functions(window, (GdkWMFunction)0);
} }
gdk_window_get_origin (m_widget->window, &root_x, &root_y); gdk_window_get_origin (m_widget->window, &root_x, &root_y);
gdk_window_get_geometry (m_widget->window, &client_x, &client_y, gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
&width, &height, NULL); &width, &height, NULL);
@@ -554,7 +554,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor); gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc); gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
} }
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(), wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(), (WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)GDK_WINDOW_XWINDOW(window), (WXWindow)GDK_WINDOW_XWINDOW(window),
@@ -995,6 +995,9 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
{ {
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
GdkWindow *window = NULL; GdkWindow *window = NULL;
if (m_wxwindow) if (m_wxwindow)
{ {

11
src/gtk1/toplevel.cpp
View File

@@ -506,10 +506,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
m_fsIsShowing = show; m_fsIsShowing = show;
GdkWindow *window = m_widget->window; GdkWindow *window = m_widget->window;
wxX11FullScreenMethod method = wxX11FullScreenMethod method =
wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW()); (WXWindow)GDK_ROOT_WINDOW());
if (show) if (show)
{ {
m_fsSaveFlag = style; m_fsSaveFlag = style;
@@ -531,7 +531,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gdk_window_set_decorations(window, (GdkWMDecoration)0); gdk_window_set_decorations(window, (GdkWMDecoration)0);
gdk_window_set_functions(window, (GdkWMFunction)0); gdk_window_set_functions(window, (GdkWMFunction)0);
} }
gdk_window_get_origin (m_widget->window, &root_x, &root_y); gdk_window_get_origin (m_widget->window, &root_x, &root_y);
gdk_window_get_geometry (m_widget->window, &client_x, &client_y, gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
&width, &height, NULL); &width, &height, NULL);
@@ -554,7 +554,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor); gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc); gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
} }
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(), wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(), (WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)GDK_WINDOW_XWINDOW(window), (WXWindow)GDK_WINDOW_XWINDOW(window),
@@ -995,6 +995,9 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
{ {
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
GdkWindow *window = NULL; GdkWindow *window = NULL;
if (m_wxwindow) if (m_wxwindow)
{ {

3
src/mac/app.cpp
View File

@@ -1406,7 +1406,8 @@ void wxApp::MacSuspend( bool convertClipboard )
while (node) while (node)
{ {
wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
win->MacActivate( MacGetCurrentEvent() , false ) ; if (!win->HasFlag(wxSTAY_ON_TOP))
win->MacActivate( MacGetCurrentEvent() , false ) ;
node = node->Next(); node = node->Next();
} }

3
src/mac/carbon/app.cpp
View File

@@ -1406,7 +1406,8 @@ void wxApp::MacSuspend( bool convertClipboard )
while (node) while (node)
{ {
wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data(); wxTopLevelWindow* win = (wxTopLevelWindow*) node->Data();
win->MacActivate( MacGetCurrentEvent() , false ) ; if (!win->HasFlag(wxSTAY_ON_TOP))
win->MacActivate( MacGetCurrentEvent() , false ) ;
node = node->Next(); node = node->Next();
} }

278
src/mac/carbon/toplevel.cpp
View File

@@ -60,6 +60,10 @@ static Point gs_lastWhere;
static long gs_lastWhen = 0; static long gs_lastWhen = 0;
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
// ============================================================================ // ============================================================================
// wxTopLevelWindowMac implementation // wxTopLevelWindowMac implementation
// ============================================================================ // ============================================================================
@@ -158,14 +162,14 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
wxToolTip::NotifyWindowDelete(m_macWindow) ; wxToolTip::NotifyWindowDelete(m_macWindow) ;
wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
} }
#if TARGET_CARBON #if TARGET_CARBON
if ( m_macEventHandler ) if ( m_macEventHandler )
{ {
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; m_macEventHandler = NULL ;
} }
#endif #endif
wxRemoveMacWindowAssociation( this ) ; wxRemoveMacWindowAssociation( this ) ;
if ( wxModelessWindows.Find(this) ) if ( wxModelessWindows.Find(this) )
@@ -254,8 +258,8 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
{ {
wxMacWindowEventHandlerUPP = NewEventHandlerUPP( wxMacWindowEventHandler ) ; wxMacWindowEventHandlerUPP = NewEventHandlerUPP( wxMacWindowEventHandler ) ;
} }
static const EventTypeSpec eventList[] = static const EventTypeSpec eventList[] =
{ {
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent }
} ; } ;
@@ -264,7 +268,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; m_macEventHandler = NULL ;
} }
InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
#endif #endif
} }
@@ -272,7 +276,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name ) const wxString& name )
{ {
SetName(name); SetName(name);
m_windowStyle = style; m_windowStyle = style;
@@ -288,12 +292,12 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
m_y = 50 ; m_y = 50 ;
if ( m_x < 20 ) if ( m_x < 20 )
m_x = 20 ; m_x = 20 ;
m_width = size.x; m_width = size.x;
if (m_width == -1) if (m_width == -1)
m_width = 20; m_width = 20;
m_height = size.y; m_height = size.y;
if (m_height == -1) if (m_height == -1)
m_height = 20; m_height = 20;
::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
@@ -302,10 +306,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
if ( HasFlag( wxFRAME_TOOL_WINDOW) ) if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{ {
if ( if (
HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) || HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
@@ -332,7 +336,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
{ {
wclass = kDocumentWindowClass ; // kMovableModalWindowClass ; wclass = kDocumentWindowClass ; // kMovableModalWindowClass ;
} }
else else
{ {
wclass = kDocumentWindowClass ; wclass = kDocumentWindowClass ;
} }
@@ -367,8 +371,25 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
{ {
attr |= kWindowCloseBoxAttribute ; attr |= kWindowCloseBoxAttribute ;
} }
::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ; if (HasFlag(wxSTAY_ON_TOP))
wclass = kUtilityWindowClass;
if ( HasFlag(wxFRAME_SHAPED) )
{
WindowDefSpec customWindowDefSpec;
customWindowDefSpec.defType = kWindowDefProcPtr;
customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
::CreateCustomWindow( &customWindowDefSpec, wclass,
attr, &theBoundsRect,
(WindowRef*) &m_macWindow);
}
else
{
::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
}
wxAssociateWinWithMacWindow( m_macWindow , this ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ;
wxString label ; wxString label ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
@@ -380,9 +401,16 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
MacInstallEventHandler() ; MacInstallEventHandler() ;
m_macFocus = NULL ; m_macFocus = NULL ;
if ( HasFlag(wxFRAME_SHAPED) )
{
// default shape matches the window size
wxRegion rgn(0, 0, m_width, m_height);
SetShape(rgn);
}
} }
void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin)
{ {
((Point*)localOrigin)->h = 0; ((Point*)localOrigin)->h = 0;
((Point*)localOrigin)->v = 0; ((Point*)localOrigin)->v = 0;
@@ -451,9 +479,9 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
wxMouseEvent event(wxEVT_LEFT_DOWN); wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(ev->modifiers & btnState) ; // 1 is for up bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
event.m_leftDown = isDown && !controlDown; event.m_leftDown = isDown && !controlDown;
event.m_middleDown = FALSE; event.m_middleDown = FALSE;
event.m_rightDown = isDown && controlDown; event.m_rightDown = isDown && controlDown;
@@ -482,8 +510,8 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
event.m_metaDown = ev->modifiers & cmdKey; event.m_metaDown = ev->modifiers & cmdKey;
Point localwhere = ev->where ; Point localwhere = ev->where ;
GrafPtr port ; GrafPtr port ;
::GetPort( &port ) ; ::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ; ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
::GlobalToLocal( &localwhere ) ; ::GlobalToLocal( &localwhere ) ;
@@ -528,7 +556,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
event.m_y = y ; event.m_y = y ;
event.SetEventObject( wxTheApp->s_captureWindow ) ; event.SetEventObject( wxTheApp->s_captureWindow ) ;
wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
if ( ev->what == mouseUp ) if ( ev->what == mouseUp )
{ {
wxTheApp->s_captureWindow = NULL ; wxTheApp->s_captureWindow = NULL ;
@@ -553,7 +581,7 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
{ {
switch (part) switch (part)
{ {
case inContent: case inContent:
{ {
MacFireMouseEvent( ev ) ; MacFireMouseEvent( ev ) ;
} }
@@ -565,7 +593,7 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
{ {
switch (part) switch (part)
{ {
case inContent: case inContent:
{ {
MacFireMouseEvent( ev ) ; MacFireMouseEvent( ev ) ;
} }
@@ -577,11 +605,11 @@ void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )
wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
event.m_timeStamp = ((EventRecord*)ev)->when ; event.m_timeStamp = ((EventRecord*)ev)->when ;
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ; UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
// Early versions of MacOS X don't refresh backgrounds properly, // Early versions of MacOS X don't refresh backgrounds properly,
// so refresh the whole window on activation and deactivation. // so refresh the whole window on activation and deactivation.
long osVersion = UMAGetSystemVersion(); long osVersion = UMAGetSystemVersion();
@@ -591,16 +619,16 @@ void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )
MacSuperEnabled( inIsActivating ) ; MacSuperEnabled( inIsActivating ) ;
} }
void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
{ {
} }
void wxTopLevelWindowMac::SetTitle(const wxString& title) void wxTopLevelWindowMac::SetTitle(const wxString& title)
{ {
wxWindow::SetTitle( title ) ; wxWindow::SetTitle( title ) ;
wxString label ; wxString label ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
label = wxMacMakeMacStringFromPC( m_label ) ; label = wxMacMakeMacStringFromPC( m_label ) ;
else else
@@ -615,7 +643,7 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE; return FALSE;
if (show) if (show)
{ {
// this is leading to incorrect window layering in some situations // this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::ShowWindow( (WindowRef)m_macWindow ) ; ::ShowWindow( (WindowRef)m_macWindow ) ;
@@ -651,24 +679,24 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
int former_y = m_y ; int former_y = m_y ;
int former_w = m_width ; int former_w = m_width ;
int former_h = m_height ; int former_h = m_height ;
int actualWidth = width; int actualWidth = width;
int actualHeight = height; int actualHeight = height;
int actualX = x; int actualX = x;
int actualY = y; int actualY = y;
if ((m_minWidth != -1) && (actualWidth < m_minWidth)) if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth; actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight)) if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualHeight = m_minHeight; actualHeight = m_minHeight;
if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth; actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight; actualHeight = m_maxHeight;
bool doMove = false ; bool doMove = false ;
bool doResize = false ; bool doResize = false ;
if ( actualX != former_x || actualY != former_y ) if ( actualX != former_x || actualY != former_y )
{ {
doMove = true ; doMove = true ;
@@ -735,28 +763,28 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
* has been true for any part of the update rgn the background is erased in the entire region * has been true for any part of the update rgn the background is erased in the entire region
* not just in the specified rect. * not just in the specified rect.
* *
* In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have
* the eraseBackground flag set to false are also added to this rgn. upon receiving an update event * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
* the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
* will get the eraseBackground event first * will get the eraseBackground event first
*/ */
void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
{ {
GrafPtr formerPort ; GrafPtr formerPort ;
GetPort( &formerPort ) ; GetPort( &formerPort ) ;
SetPortWindowPort( (WindowRef)m_macWindow ) ; SetPortWindowPort( (WindowRef)m_macWindow ) ;
m_macNeedsErasing |= eraseBackground ; m_macNeedsErasing |= eraseBackground ;
// if we already know that we will have to erase, there's no need to track the rest // if we already know that we will have to erase, there's no need to track the rest
if ( !m_macNeedsErasing) if ( !m_macNeedsErasing)
{ {
// we end only here if eraseBackground is false // we end only here if eraseBackground is false
// if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
// we will have to erase anyway // we will have to erase anyway
RgnHandle updateRgn = NewRgn(); RgnHandle updateRgn = NewRgn();
RgnHandle diffRgn = NewRgn() ; RgnHandle diffRgn = NewRgn() ;
if ( updateRgn && diffRgn ) if ( updateRgn && diffRgn )
{ {
@@ -791,7 +819,169 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro
SetPort( formerPort ) ; SetPort( formerPort ) ;
} }
bool wxTopLevelWindowMac::SetShape(const wxRegion& region) bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
{ {
return FALSE; wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
// The empty region signifies that the shape should be removed from the
// window.
if ( region.IsEmpty() )
{
wxSize sz = GetClientSize();
wxRegion rgn(0, 0, sz.x, sz.y);
return SetShape(rgn);
}
// Make a copy of the region
RgnHandle shapeRegion = NewRgn();
CopyRgn( (RgnHandle)region.GetWXHRGN(), shapeRegion );
// Dispose of any shape region we may already have
RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );
if ( oldRgn )
DisposeRgn(oldRgn);
// Save the region so we can use it later
SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
// Tell the window manager that the window has changed shape
ReshapeCustomWindow((WindowRef)MacGetWindowRef());
return TRUE;
} }
// ---------------------------------------------------------------------------
// Support functions for shaped windows, based on Apple's CustomWindow sample at
// http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
// ---------------------------------------------------------------------------
static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
{
GetWindowPortBounds(window, inRect);
Point pt = {inRect->left, inRect->top};
SetPort((GrafPtr) GetWindowPort(window));
LocalToGlobal(&pt);
inRect->top = pt.v;
inRect->left = pt.h;
inRect->bottom += pt.v;
inRect->right += pt.h;
}
static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
{
/*------------------------------------------------------
Define which options your custom window supports.
--------------------------------------------------------*/
//just enable everything for our demo
*(OptionBits*)param=//kWindowCanGrow|
//kWindowCanZoom|
//kWindowCanCollapse|
//kWindowCanGetWindowRegion|
//kWindowHasTitleBar|
//kWindowSupportsDragHilite|
kWindowCanDrawInCurrentPort|
//kWindowCanMeasureTitle|
kWindowWantsDisposeAtProcessDeath|
kWindowSupportsSetGrowImageRegion|
kWindowDefSupportsColorGrafPort;
return 1;
}
// The content region is left as a rectangle matching the window size, this is
// so the origin in the paint event, and etc. still matches what the
// programmer expects.
static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
{
SetEmptyRgn(rgn);
wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
if (win)
{
wxRect r = win->GetRect();
SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
}
}
// The structure region is set to the shape given to the SetShape method.
static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
{
RgnHandle cachedRegion = (RgnHandle) GetWRefCon(window);
SetEmptyRgn(rgn);
if (cachedRegion)
{
Rect windowRect;
wxShapedMacWindowGetPos(window, &windowRect); //how big is the window
CopyRgn(cachedRegion, rgn); //make a copy of our cached region
OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
//MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size
}
}
static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
{
GetWindowRegionPtr rgnRec=(GetWindowRegionPtr)param;
switch(rgnRec->regionCode)
{
case kWindowStructureRgn:
wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
break;
case kWindowContentRgn:
wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
break;
default:
SetEmptyRgn(rgnRec->winRgn);
} //switch
return noErr;
}
static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param)
{
/*------------------------------------------------------
Determine the region of the window which was hit
--------------------------------------------------------*/
Point hitPoint;
static RgnHandle tempRgn=nil;
if(!tempRgn)
tempRgn=NewRgn();
SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked
//Mac OS 8.5 or later
wxShapedMacWindowStructureRegion(window, tempRgn);
if (PtInRgn(hitPoint, tempRgn)) //in window content region?
return wInContent;
return wNoHit;//no significant area was hit.
}
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param)
{
switch(message)
{
case kWindowMsgHitTest:
return wxShapedMacWindowHitTest(window,param);
case kWindowMsgGetFeatures:
return wxShapedMacWindowGetFeatures(window,param);
// kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
case kWindowMsgGetRegion:
return wxShapedMacWindowGetRegion(window,param);
}
return 0;
}
// ---------------------------------------------------------------------------

278
src/mac/toplevel.cpp
View File

@@ -60,6 +60,10 @@ static Point gs_lastWhere;
static long gs_lastWhen = 0; static long gs_lastWhen = 0;
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
// ============================================================================ // ============================================================================
// wxTopLevelWindowMac implementation // wxTopLevelWindowMac implementation
// ============================================================================ // ============================================================================
@@ -158,14 +162,14 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
wxToolTip::NotifyWindowDelete(m_macWindow) ; wxToolTip::NotifyWindowDelete(m_macWindow) ;
wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
} }
#if TARGET_CARBON #if TARGET_CARBON
if ( m_macEventHandler ) if ( m_macEventHandler )
{ {
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; m_macEventHandler = NULL ;
} }
#endif #endif
wxRemoveMacWindowAssociation( this ) ; wxRemoveMacWindowAssociation( this ) ;
if ( wxModelessWindows.Find(this) ) if ( wxModelessWindows.Find(this) )
@@ -254,8 +258,8 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
{ {
wxMacWindowEventHandlerUPP = NewEventHandlerUPP( wxMacWindowEventHandler ) ; wxMacWindowEventHandlerUPP = NewEventHandlerUPP( wxMacWindowEventHandler ) ;
} }
static const EventTypeSpec eventList[] = static const EventTypeSpec eventList[] =
{ {
{ kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent }
} ; } ;
@@ -264,7 +268,7 @@ void wxTopLevelWindowMac::MacInstallEventHandler()
::RemoveEventHandler((EventHandlerRef) m_macEventHandler); ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ; m_macEventHandler = NULL ;
} }
InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler)); InstallWindowEventHandler(MAC_WXHWND(m_macWindow), wxMacWindowEventHandlerUPP, WXSIZEOF(eventList), eventList, this, &((EventHandlerRef)m_macEventHandler));
#endif #endif
} }
@@ -272,7 +276,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style, long style,
const wxString& name ) const wxString& name )
{ {
SetName(name); SetName(name);
m_windowStyle = style; m_windowStyle = style;
@@ -288,12 +292,12 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
m_y = 50 ; m_y = 50 ;
if ( m_x < 20 ) if ( m_x < 20 )
m_x = 20 ; m_x = 20 ;
m_width = size.x; m_width = size.x;
if (m_width == -1) if (m_width == -1)
m_width = 20; m_width = 20;
m_height = size.y; m_height = size.y;
if (m_height == -1) if (m_height == -1)
m_height = 20; m_height = 20;
::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height);
@@ -302,10 +306,10 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
WindowClass wclass = 0; WindowClass wclass = 0;
WindowAttributes attr = kWindowNoAttributes ; WindowAttributes attr = kWindowNoAttributes ;
if ( HasFlag( wxFRAME_TOOL_WINDOW) ) if ( HasFlag( wxFRAME_TOOL_WINDOW) )
{ {
if ( if (
HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) || HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) || HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
@@ -332,7 +336,7 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
{ {
wclass = kDocumentWindowClass ; // kMovableModalWindowClass ; wclass = kDocumentWindowClass ; // kMovableModalWindowClass ;
} }
else else
{ {
wclass = kDocumentWindowClass ; wclass = kDocumentWindowClass ;
} }
@@ -367,8 +371,25 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
{ {
attr |= kWindowCloseBoxAttribute ; attr |= kWindowCloseBoxAttribute ;
} }
::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ; if (HasFlag(wxSTAY_ON_TOP))
wclass = kUtilityWindowClass;
if ( HasFlag(wxFRAME_SHAPED) )
{
WindowDefSpec customWindowDefSpec;
customWindowDefSpec.defType = kWindowDefProcPtr;
customWindowDefSpec.u.defProc = NewWindowDefUPP(wxShapedMacWindowDef);
::CreateCustomWindow( &customWindowDefSpec, wclass,
attr, &theBoundsRect,
(WindowRef*) &m_macWindow);
}
else
{
::CreateNewWindow( wclass , attr , &theBoundsRect , (WindowRef*)&m_macWindow ) ;
}
wxAssociateWinWithMacWindow( m_macWindow , this ) ; wxAssociateWinWithMacWindow( m_macWindow , this ) ;
wxString label ; wxString label ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
@@ -380,9 +401,16 @@ void wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
MacInstallEventHandler() ; MacInstallEventHandler() ;
m_macFocus = NULL ; m_macFocus = NULL ;
if ( HasFlag(wxFRAME_SHAPED) )
{
// default shape matches the window size
wxRegion rgn(0, 0, m_width, m_height);
SetShape(rgn);
}
} }
void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin) void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXHWND *window , wxWindowMac** rootwin)
{ {
((Point*)localOrigin)->h = 0; ((Point*)localOrigin)->h = 0;
((Point*)localOrigin)->v = 0; ((Point*)localOrigin)->v = 0;
@@ -451,9 +479,9 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
wxMouseEvent event(wxEVT_LEFT_DOWN); wxMouseEvent event(wxEVT_LEFT_DOWN);
bool isDown = !(ev->modifiers & btnState) ; // 1 is for up bool isDown = !(ev->modifiers & btnState) ; // 1 is for up
bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse
event.m_leftDown = isDown && !controlDown; event.m_leftDown = isDown && !controlDown;
event.m_middleDown = FALSE; event.m_middleDown = FALSE;
event.m_rightDown = isDown && controlDown; event.m_rightDown = isDown && controlDown;
@@ -482,8 +510,8 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
event.m_metaDown = ev->modifiers & cmdKey; event.m_metaDown = ev->modifiers & cmdKey;
Point localwhere = ev->where ; Point localwhere = ev->where ;
GrafPtr port ; GrafPtr port ;
::GetPort( &port ) ; ::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ; ::SetPort( UMAGetWindowPort( (WindowRef)m_macWindow ) ) ;
::GlobalToLocal( &localwhere ) ; ::GlobalToLocal( &localwhere ) ;
@@ -528,7 +556,7 @@ void wxTopLevelWindowMac::MacFireMouseEvent( WXEVENTREF evr )
event.m_y = y ; event.m_y = y ;
event.SetEventObject( wxTheApp->s_captureWindow ) ; event.SetEventObject( wxTheApp->s_captureWindow ) ;
wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ;
if ( ev->what == mouseUp ) if ( ev->what == mouseUp )
{ {
wxTheApp->s_captureWindow = NULL ; wxTheApp->s_captureWindow = NULL ;
@@ -553,7 +581,7 @@ void wxTopLevelWindowMac::MacMouseUp( WXEVENTREF ev , short part)
{ {
switch (part) switch (part)
{ {
case inContent: case inContent:
{ {
MacFireMouseEvent( ev ) ; MacFireMouseEvent( ev ) ;
} }
@@ -565,7 +593,7 @@ void wxTopLevelWindowMac::MacMouseMoved( WXEVENTREF ev , short part)
{ {
switch (part) switch (part)
{ {
case inContent: case inContent:
{ {
MacFireMouseEvent( ev ) ; MacFireMouseEvent( ev ) ;
} }
@@ -577,11 +605,11 @@ void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )
wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId);
event.m_timeStamp = ((EventRecord*)ev)->when ; event.m_timeStamp = ((EventRecord*)ev)->when ;
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ; UMAHighlightAndActivateWindow( (WindowRef)m_macWindow , inIsActivating ) ;
// Early versions of MacOS X don't refresh backgrounds properly, // Early versions of MacOS X don't refresh backgrounds properly,
// so refresh the whole window on activation and deactivation. // so refresh the whole window on activation and deactivation.
long osVersion = UMAGetSystemVersion(); long osVersion = UMAGetSystemVersion();
@@ -591,16 +619,16 @@ void wxTopLevelWindowMac::MacActivate( WXEVENTREF ev , bool inIsActivating )
MacSuperEnabled( inIsActivating ) ; MacSuperEnabled( inIsActivating ) ;
} }
void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev ) void wxTopLevelWindowMac::MacKeyDown( WXEVENTREF ev )
{ {
} }
void wxTopLevelWindowMac::SetTitle(const wxString& title) void wxTopLevelWindowMac::SetTitle(const wxString& title)
{ {
wxWindow::SetTitle( title ) ; wxWindow::SetTitle( title ) ;
wxString label ; wxString label ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
label = wxMacMakeMacStringFromPC( m_label ) ; label = wxMacMakeMacStringFromPC( m_label ) ;
else else
@@ -615,7 +643,7 @@ bool wxTopLevelWindowMac::Show(bool show)
return FALSE; return FALSE;
if (show) if (show)
{ {
// this is leading to incorrect window layering in some situations // this is leading to incorrect window layering in some situations
// ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil); // ::TransitionWindow((WindowRef)m_macWindow,kWindowZoomTransitionEffect,kWindowShowTransitionAction,nil);
::ShowWindow( (WindowRef)m_macWindow ) ; ::ShowWindow( (WindowRef)m_macWindow ) ;
@@ -651,24 +679,24 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
int former_y = m_y ; int former_y = m_y ;
int former_w = m_width ; int former_w = m_width ;
int former_h = m_height ; int former_h = m_height ;
int actualWidth = width; int actualWidth = width;
int actualHeight = height; int actualHeight = height;
int actualX = x; int actualX = x;
int actualY = y; int actualY = y;
if ((m_minWidth != -1) && (actualWidth < m_minWidth)) if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth; actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight)) if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualHeight = m_minHeight; actualHeight = m_minHeight;
if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth; actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight; actualHeight = m_maxHeight;
bool doMove = false ; bool doMove = false ;
bool doResize = false ; bool doResize = false ;
if ( actualX != former_x || actualY != former_y ) if ( actualX != former_x || actualY != former_y )
{ {
doMove = true ; doMove = true ;
@@ -735,28 +763,28 @@ void wxTopLevelWindowMac::DoMoveWindow(int x, int y, int width, int height)
* has been true for any part of the update rgn the background is erased in the entire region * has been true for any part of the update rgn the background is erased in the entire region
* not just in the specified rect. * not just in the specified rect.
* *
* In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have * In order to achive this, we also have an internal m_macNoEraseUpdateRgn, all rects that have
* the eraseBackground flag set to false are also added to this rgn. upon receiving an update event * the eraseBackground flag set to false are also added to this rgn. upon receiving an update event
* the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window * the update rgn is compared to the m_macNoEraseUpdateRgn and in case they differ, every window
* will get the eraseBackground event first * will get the eraseBackground event first
*/ */
void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground ) void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackground )
{ {
GrafPtr formerPort ; GrafPtr formerPort ;
GetPort( &formerPort ) ; GetPort( &formerPort ) ;
SetPortWindowPort( (WindowRef)m_macWindow ) ; SetPortWindowPort( (WindowRef)m_macWindow ) ;
m_macNeedsErasing |= eraseBackground ; m_macNeedsErasing |= eraseBackground ;
// if we already know that we will have to erase, there's no need to track the rest // if we already know that we will have to erase, there's no need to track the rest
if ( !m_macNeedsErasing) if ( !m_macNeedsErasing)
{ {
// we end only here if eraseBackground is false // we end only here if eraseBackground is false
// if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn // if we already have a difference between m_macNoEraseUpdateRgn and UpdateRgn
// we will have to erase anyway // we will have to erase anyway
RgnHandle updateRgn = NewRgn(); RgnHandle updateRgn = NewRgn();
RgnHandle diffRgn = NewRgn() ; RgnHandle diffRgn = NewRgn() ;
if ( updateRgn && diffRgn ) if ( updateRgn && diffRgn )
{ {
@@ -791,7 +819,169 @@ void wxTopLevelWindowMac::MacInvalidate( const WXRECTPTR rect, bool eraseBackgro
SetPort( formerPort ) ; SetPort( formerPort ) ;
} }
bool wxTopLevelWindowMac::SetShape(const wxRegion& region) bool wxTopLevelWindowMac::SetShape(const wxRegion& region)
{ {
return FALSE; wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
// The empty region signifies that the shape should be removed from the
// window.
if ( region.IsEmpty() )
{
wxSize sz = GetClientSize();
wxRegion rgn(0, 0, sz.x, sz.y);
return SetShape(rgn);
}
// Make a copy of the region
RgnHandle shapeRegion = NewRgn();
CopyRgn( (RgnHandle)region.GetWXHRGN(), shapeRegion );
// Dispose of any shape region we may already have
RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );
if ( oldRgn )
DisposeRgn(oldRgn);
// Save the region so we can use it later
SetWRefCon((WindowRef)MacGetWindowRef(), (SInt32)shapeRegion);
// Tell the window manager that the window has changed shape
ReshapeCustomWindow((WindowRef)MacGetWindowRef());
return TRUE;
} }
// ---------------------------------------------------------------------------
// Support functions for shaped windows, based on Apple's CustomWindow sample at
// http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
// ---------------------------------------------------------------------------
static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
{
GetWindowPortBounds(window, inRect);
Point pt = {inRect->left, inRect->top};
SetPort((GrafPtr) GetWindowPort(window));
LocalToGlobal(&pt);
inRect->top = pt.v;
inRect->left = pt.h;
inRect->bottom += pt.v;
inRect->right += pt.h;
}
static SInt32 wxShapedMacWindowGetFeatures(WindowRef window, SInt32 param)
{
/*------------------------------------------------------
Define which options your custom window supports.
--------------------------------------------------------*/
//just enable everything for our demo
*(OptionBits*)param=//kWindowCanGrow|
//kWindowCanZoom|
//kWindowCanCollapse|
//kWindowCanGetWindowRegion|
//kWindowHasTitleBar|
//kWindowSupportsDragHilite|
kWindowCanDrawInCurrentPort|
//kWindowCanMeasureTitle|
kWindowWantsDisposeAtProcessDeath|
kWindowSupportsSetGrowImageRegion|
kWindowDefSupportsColorGrafPort;
return 1;
}
// The content region is left as a rectangle matching the window size, this is
// so the origin in the paint event, and etc. still matches what the
// programmer expects.
static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
{
SetEmptyRgn(rgn);
wxTopLevelWindowMac* win = wxFindWinFromMacWindow(window);
if (win)
{
wxRect r = win->GetRect();
SetRectRgn(rgn, r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
}
}
// The structure region is set to the shape given to the SetShape method.
static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
{
RgnHandle cachedRegion = (RgnHandle) GetWRefCon(window);
SetEmptyRgn(rgn);
if (cachedRegion)
{
Rect windowRect;
wxShapedMacWindowGetPos(window, &windowRect); //how big is the window
CopyRgn(cachedRegion, rgn); //make a copy of our cached region
OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
//MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size
}
}
static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
{
GetWindowRegionPtr rgnRec=(GetWindowRegionPtr)param;
switch(rgnRec->regionCode)
{
case kWindowStructureRgn:
wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
break;
case kWindowContentRgn:
wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
break;
default:
SetEmptyRgn(rgnRec->winRgn);
} //switch
return noErr;
}
static SInt32 wxShapedMacWindowHitTest(WindowRef window,SInt32 param)
{
/*------------------------------------------------------
Determine the region of the window which was hit
--------------------------------------------------------*/
Point hitPoint;
static RgnHandle tempRgn=nil;
if(!tempRgn)
tempRgn=NewRgn();
SetPt(&hitPoint,LoWord(param),HiWord(param));//get the point clicked
//Mac OS 8.5 or later
wxShapedMacWindowStructureRegion(window, tempRgn);
if (PtInRgn(hitPoint, tempRgn)) //in window content region?
return wInContent;
return wNoHit;//no significant area was hit.
}
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param)
{
switch(message)
{
case kWindowMsgHitTest:
return wxShapedMacWindowHitTest(window,param);
case kWindowMsgGetFeatures:
return wxShapedMacWindowGetFeatures(window,param);
// kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
case kWindowMsgGetRegion:
return wxShapedMacWindowGetRegion(window,param);
}
return 0;
}
// ---------------------------------------------------------------------------

3
src/msw/toplevel.cpp
View File

@@ -726,6 +726,9 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
{ {
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
// The empty region signifies that the shape should be removed from the // The empty region signifies that the shape should be removed from the
// window. // window.
if ( region.IsEmpty() ) if ( region.IsEmpty() )

17
wxPython/demo/ShapedWindow.py
View File

@@ -7,8 +7,10 @@ import images
class TestFrame(wxFrame): class TestFrame(wxFrame):
def __init__(self, parent, log): def __init__(self, parent, log):
self.log = log self.log = log
wxFrame.__init__(self, parent, -1, "Shaped Window") wxFrame.__init__(self, parent, -1, "Shaped Window",
style = wxFRAME_SHAPED )
self.hasShape = False self.hasShape = False
self.delta = wxPoint(0,0)
EVT_LEFT_DCLICK(self, self.OnDoubleClick) EVT_LEFT_DCLICK(self, self.OnDoubleClick)
EVT_LEFT_DOWN(self, self.OnLeftDown) EVT_LEFT_DOWN(self, self.OnLeftDown)
@@ -20,8 +22,11 @@ class TestFrame(wxFrame):
self.bmp = images.getTuxBitmap() self.bmp = images.getTuxBitmap()
w, h = self.bmp.GetWidth(), self.bmp.GetHeight() w, h = self.bmp.GetWidth(), self.bmp.GetHeight()
self.SetClientSize( (w, h) ) self.SetClientSize( (w, h) )
self.SetToolTipString("Right-click to close the window\n"
"Double-click the image to set/unset the window shape") if wxPlatform != "__WXMAC__":
# wxMac clips the tooltip to the window shape, YUCK!!!
self.SetToolTipString("Right-click to close the window\n"
"Double-click the image to set/unset the window shape")
if wxPlatform == "__WXGTK__": if wxPlatform == "__WXGTK__":
# wxGTK requires that the window be created before you can # wxGTK requires that the window be created before you can
@@ -29,9 +34,11 @@ class TestFrame(wxFrame):
# this event. # this event.
EVT_WINDOW_CREATE(self, self.SetWindowShape) EVT_WINDOW_CREATE(self, self.SetWindowShape)
else: else:
# On wxMSW the window has already been created, so go for it. # On wxMSW and wxMac the window has already been created, so go for it.
self.SetWindowShape() pass #self.SetWindowShape()
dc = wxClientDC(self)
dc.DrawBitmap(self.bmp, 0,0, True)
def SetWindowShape(self, *evt): def SetWindowShape(self, *evt):

1
wxPython/src/_defs.i
View File

@@ -221,6 +221,7 @@ enum {
wxFRAME_FLOAT_ON_PARENT, wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU, wxFRAME_NO_WINDOW_MENU,
wxFRAME_NO_TASKBAR, wxFRAME_NO_TASKBAR,
wxFRAME_SHAPED,
wxED_CLIENT_MARGIN, wxED_CLIENT_MARGIN,
wxED_BUTTONS_BOTTOM, wxED_BUTTONS_BOTTOM,