BEGIN_EVENT_TABLE(wxControl, wxWindow)
EVT_MOUSE_EVENTS( wxControl::OnMouseEvent )
- EVT_CHAR( wxControl::OnKeyDown )
+// EVT_CHAR( wxControl::OnKeyDown )
EVT_PAINT( wxControl::OnPaint )
END_EVENT_TABLE()
#endif
#include "wx/mac/uma.h"
+#include "wx/mac/private.h"
// Item members
+
+#if PRAGMA_STRUCT_ALIGN
+ #pragma options align=mac68k
+#elif PRAGMA_STRUCT_PACKPUSH
+ #pragma pack(push, 2)
+#elif PRAGMA_STRUCT_PACK
+ #pragma pack(2)
+#endif
+
+typedef struct {
+ unsigned short instruction;
+ void (*function)();
+} cdefRec, *cdefPtr, **cdefHandle;
+
+#if PRAGMA_STRUCT_ALIGN
+ #pragma options align=reset
+#elif PRAGMA_STRUCT_PACKPUSH
+ #pragma pack(pop)
+#elif PRAGMA_STRUCT_PACK
+ #pragma pack()
+#endif
+
ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
+wxControl *wxFindControlFromMacControl(ControlHandle inControl ) ;
pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode ) ;
pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode )
}
}
+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
+ControlDefUPP wxMacControlActionUPP = NULL ;
+
+pascal SInt32 wxMacControlDefinition(SInt16 varCode, ControlRef theControl, ControlDefProcMessage message, SInt32 param)
+{
+
+ wxControl* wx = (wxControl*) wxFindControlFromMacControl( theControl ) ;
+ if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+ {
+ if( message == drawCntl )
+ {
+ wxMacWindowClipper clip( wx ) ;
+ return InvokeControlDefUPP( varCode , theControl , message , param , (ControlDefUPP) wx->MacGetControlAction() ) ;
+ }
+ else
+ return InvokeControlDefUPP( varCode , theControl , message , param , (ControlDefUPP) wx->MacGetControlAction() ) ;
+ }
+ return NULL ;
+}
+
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
+{
+ OSStatus status = noErr ;
+ switch( iMessage )
+ {
+ case kControlMsgSetUpBackground :
+ {
+ wxControl* wx = (wxControl*) GetControlReference( iControl ) ;
+ if ( wx != NULL && wx->IsKindOf( CLASSINFO( wxControl ) ) )
+ {
+ wxDC::MacSetupBackgroundForCurrentPort( wx->MacGetBackgroundBrush() ) ;
+ // SetThemeBackground( iDepth , iIsColor ) ;
+ }
+ else
+ {
+ status = paramErr ;
+ }
+ }
+ break ;
+ default :
+ status = paramErr ;
+ break ;
+ }
+ return status ;
+}
+
wxControl::wxControl()
{
m_macControl = NULL ;
+ m_macControlAction = NULL ;
m_macHorizontalBorder = 0 ; // additional pixels around the real control
m_macVerticalBorder = 0 ;
m_backgroundColour = *wxWHITE;
m_macControl = NULL ;
m_macHorizontalBorder = 0 ; // additional pixels around the real control
m_macVerticalBorder = 0 ;
+
bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+ if ( parent )
+ {
+ m_backgroundColour = parent->GetBackgroundColour() ;
+ m_foregroundColour = parent->GetForegroundColour() ;
+ }
if (rval) {
#if wxUSE_VALIDATORS
SetValidator(validator);
wxControl::~wxControl()
{
m_isBeingDeleted = TRUE;
+ wxRemoveMacControlAssociation( this ) ;
// If we delete an item, we should initialize the parent panel,
// because it could now be invalid.
wxWindow *parent = GetParent() ;
void wxControl::SetLabel(const wxString& title)
{
- m_label = title ;
+ m_label = wxStripMenuCodes(title) ;
if ( (ControlHandle) m_macControl )
{
wxString label ;
if( wxApp::s_macDefaultEncodingIsPC )
- label = wxMacMakeMacStringFromPC( title ) ;
+ label = wxMacMakeMacStringFromPC( m_label ) ;
else
- label = title ;
+ label = m_label ;
#if TARGET_CARBON
c2pstrcpy( (StringPtr) maclabel , label ) ;
wxNode *node = wxWinMacControlList->Find((long)inControl);
if (!node)
return NULL;
- return (wxControl *)node->Data();
+ return (wxControl *)node->GetData();
}
void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *control)
m_macControlIsShown = true ;
wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
+ if ( wxMacSetupControlBackgroundUPP == NULL )
+ {
+ wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+ }
+ if ( wxMacControlActionUPP == NULL )
+ {
+ wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefinition ) ;
+ }
+ // The following block of code is responsible for crashes when switching
+ // back to windows, which can be seen in the dialogs sample.
+ // It is disabled until a proper solution can be found.
+#if 0
+#if TARGET_CARBON
+/*
+ only working under classic carbon
+ m_macControlAction = *(**(ControlHandle)m_macControl).contrlDefProc ;
+ (**(ControlHandle)m_macControl).contrlDefProc = (Handle) &wxMacControlActionUPP ;
+*/
+#else
+ m_macControlAction = *(**(ControlHandle)m_macControl).contrlDefProc ;
+ cdefHandle cdef ;
+ cdef = (cdefHandle) NewHandle( sizeof(cdefRec) ) ;
+ if ( (**(ControlHandle)m_macControl).contrlDefProc != NULL )
+ {
+ (**cdef).instruction = 0x4EF9; /* JMP instruction */
+ (**cdef).function = (void(*)()) wxMacControlActionUPP;
+ (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
+ }
+#endif
+#endif
+ SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
// Adjust the controls size and position
wxPoint pos(m_x, m_y);
SetSize(pos.x, pos.y, new_size.x, new_size.y);
UMAShowControl( (ControlHandle) m_macControl ) ;
+
+ SetCursor( *wxSTANDARD_CURSOR ) ;
+
Refresh() ;
}
else
m_width = bestsize.right - bestsize.left ;
- m_width += 2 * m_macHorizontalBorder ;
+ m_width += 2 * m_macHorizontalBorder + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
}
if ( m_height == -1 )
{
if ( m_height < 10 )
m_height = 13 ;
- m_height += 2 * m_macVerticalBorder;
+ m_height += 2 * m_macVerticalBorder + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
}
-
- UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
+ MacUpdateDimensions() ;
+// UMASizeControl( (ControlHandle) m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
}
}
return wxWindow::MacGetContainerForEmbedding() ;
}
-void wxControl::MacSuperChangedPosition()
+void wxControl::MacUpdateDimensions()
{
- if ( (ControlHandle) m_macControl )
- {
- Rect contrlRect ;
- GetControlBounds( (ControlHandle) m_macControl , &contrlRect ) ;
- int former_mac_x = contrlRect.left ;
- int former_mac_y = contrlRect.top ;
- int mac_x = m_x ;
- int mac_y = m_y ;
- GetParent()->MacWindowToRootWindow( & mac_x , & mac_y ) ;
-
- WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
-
- if ( mac_x + m_macHorizontalBorder != former_mac_x ||
- mac_y + m_macVerticalBorder != former_mac_y )
- {
- {
- Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
- InvalWindowRect( rootwindow , &inval ) ;
- }
- UMAMoveControl( (ControlHandle) m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
- {
- Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
- InvalWindowRect( rootwindow , &inval ) ;
- }
- }
- }
+ // actually in the current systems this should never be possible, but later reparenting
+ // may become a reality
+
+ if ( (ControlHandle) m_macControl == NULL )
+ return ;
+
+ if ( GetParent() == NULL )
+ return ;
+
+ WindowRef rootwindow = (WindowRef) MacGetRootWindow() ;
+ if ( rootwindow == NULL )
+ return ;
+
+ Rect oldBounds ;
+ GetControlBounds( (ControlHandle) m_macControl , &oldBounds ) ;
+
+ int new_x = m_x + MacGetLeftBorderSize() + m_macHorizontalBorder ;
+ int new_y = m_y + MacGetTopBorderSize() + m_macVerticalBorder ;
+ int new_width = m_width - MacGetLeftBorderSize() - MacGetRightBorderSize() - 2 * m_macHorizontalBorder ;
+ int new_height = m_height - MacGetTopBorderSize() - MacGetBottomBorderSize() - 2 * m_macVerticalBorder ;
+
+ GetParent()->MacWindowToRootWindow( & new_x , & new_y ) ;
+ bool doMove = new_x != oldBounds.left || new_y != oldBounds.top ;
+ bool doResize = ( oldBounds.right - oldBounds.left ) != new_width || (oldBounds.bottom - oldBounds.top ) != new_height ;
+ if ( doMove || doResize )
+ {
+ InvalWindowRect( rootwindow, &oldBounds ) ;
+ if ( doMove )
+ {
+ UMAMoveControl( (ControlHandle) m_macControl , new_x , new_y ) ;
+ }
+ if ( doResize )
+ {
+ UMASizeControl( (ControlHandle) m_macControl , new_width , new_height ) ;
+ }
+ }
+}
+void wxControl::MacSuperChangedPosition()
+{
+ MacUpdateDimensions() ;
wxWindow::MacSuperChangedPosition() ;
}
int width, int height,
int sizeFlags )
{
+ wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
+ return ;
+/*
+
if ( (ControlHandle) m_macControl == NULL )
{
wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
Refresh() ;
}
+*/
}
bool wxControl::Show(bool show)
void wxControl::MacRedrawControl()
{
- if ( (ControlHandle) m_macControl && MacGetRootWindow() )
+ if ( (ControlHandle) m_macControl && MacGetRootWindow() && m_macControlIsShown )
{
wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ;
-
- // the controls sometimes draw outside their boundaries, this
- // should be resolved differently but is not trivial (e.g. drop shadows)
- // since adding them to the border would yield in enormous gaps between
- // the controls
- Rect r = { 0 , 0 , 32000 , 32000 } ;
- ClipRect( &r ) ;
+ wxMacWindowClipper clipper(this) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ;
}
{
wxPaintDC dc(this) ;
wxMacPortSetter helper(&dc) ;
- // the controls sometimes draw outside their boundaries, this
- // should be resolved differently but is not trivial (e.g. drop shadows)
- // since adding them to the border would yield in enormous gaps between
- // the controls
- Rect r = { 0 , 0 , 32000 , 32000 } ;
- ClipRect( &r ) ;
-
+ wxMacWindowClipper clipper(this) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ;
}
ControlHandle control ;
Point localwhere ;
SInt16 controlpart ;
- WindowRef window = (WindowRef) MacGetRootWindow() ;
localwhere.h = x ;
localwhere.v = y ;
if ( event.m_metaDown )
modifiers |= cmdKey ;
-/*
-#if TARGET_CARBON
- control = FindControlUnderMouse( localwhere , window , &controlpart ) ;
-#else
- controlpart = FindControl( localwhere , window , &control ) ;
-#endif
-*/
{
- /*
- if ( AcceptsFocus() && FindFocus() != this )
- {
- SetFocus() ;
- }
- */
control = (ControlHandle) m_macControl ;
if ( control && ::IsControlActive( control ) )
{
projects / wxWidgets.git / blobdiff