wxControl* wx = (wxControl*) GetControlReference( control ) ;
if ( wx )
{
- wx->MacHandleControlClick( control , partCode ) ;
+ wx->MacHandleControlClick( control , partCode , true /* stillDown */ ) ;
}
}
}
m_macVerticalBorder = 0 ;
m_backgroundColour = *wxWHITE;
m_foregroundColour = *wxBLACK;
-#if WXWIN_COMPATIBILITY
- m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
if ( wxMacLiveScrollbarActionUPP == NULL )
{
{
m_label = wxStripMenuCodes(title) ;
- if ( (ControlHandle) m_macControl )
+ if ( m_macControl )
{
- Str255 maclabel ;
- wxString label ;
-
- if( wxApp::s_macDefaultEncodingIsPC )
- label = wxMacMakeMacStringFromPC( m_label ) ;
- else
- label = m_label ;
-
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) maclabel , label ) ;
-#else
- strcpy( (char *) maclabel , label ) ;
- c2pstr( (char *) maclabel ) ;
-#endif
- ::SetControlTitle( (ControlHandle) m_macControl , maclabel ) ;
+ UMASetControlTitle( (ControlHandle) m_macControl , m_label ) ;
}
Refresh() ;
}
bool wxControl::ProcessCommand (wxCommandEvent & event)
{
- // Tries:
- // 1) A callback function (to become obsolete)
- // 2) OnCommand, starting at this window and working up parent hierarchy
- // 3) OnCommand then calls ProcessEvent to search the event tables.
-#if WXWIN_COMPATIBILITY
- if ( m_callback )
- {
- (void)(*m_callback)(this, event);
-
- return TRUE;
- }
- else
-#endif // WXWIN_COMPATIBILITY
- {
- return GetEventHandler()->ProcessEvent(event);
- }
+ // Tries:
+ // 1) OnCommand, starting at this window and working up parent hierarchy
+ // 2) OnCommand then calls ProcessEvent to search the event tables.
+ return GetEventHandler()->ProcessEvent(event);
}
// ------------------------
{
// adding NULL WindowRef is (first) surely a result of an error and
// (secondly) breaks menu command processing
- wxCHECK_RET( inControl != (ControlHandle) NULL, "attempt to add a NULL WindowRef to window list" );
+ wxCHECK_RET( inControl != (ControlHandle) NULL, wxT("attempt to add a NULL WindowRef to window list") );
if ( !wxWinMacControlList->Find((long)inControl) )
wxWinMacControlList->Append((long)inControl, control);
void wxRemoveMacControlAssociation(wxControl *control)
{
- wxWinMacControlList->DeleteObject(control);
+ if ( wxWinMacControlList )
+ wxWinMacControlList->DeleteObject(control);
}
void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label ,
const wxString& name , WXRECTPTR outBounds , unsigned char* maclabel )
{
m_label = label ;
- SetName(name);
- if ( &validator )
- SetValidator(validator);
-
- m_windowStyle = style;
- parent->AddChild(this);
-
- m_backgroundColour = parent->GetBackgroundColour() ;
- m_foregroundColour = parent->GetForegroundColour() ;
-
- if (id == -1)
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
- // These sizes will be adjusted in MacPostControlCreate
+ // These sizes will be adjusted in MacPostControlCreate
m_width = size.x ;
m_height = size.y ;
m_x = pos.x ;
void wxControl::MacPostControlCreate()
{
- wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+ wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
{
{
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
- controlstyle.font = kControlFontSmallSystemFont ;
+
+ if (IsKindOf( CLASSINFO( wxButton ) ) )
+ controlstyle.font = kControlFontSmallSystemFont ; // eventually kControlFontBigSystemFont ;
+ else
+ controlstyle.font = kControlFontSmallSystemFont ;
::SetControlFontStyle( (ControlHandle) m_macControl , &controlstyle ) ;
}
ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
::EmbedControl( (ControlHandle) m_macControl , container ) ;
- m_macControlIsShown = true ;
+ m_macControlIsShown = MacIsReallyShown() ;
wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
if ( wxMacSetupControlBackgroundUPP == NULL )
SetSize(pos.x, pos.y, new_size.x, new_size.y);
- UMAShowControl( (ControlHandle) m_macControl ) ;
+#if wxUSE_UNICODE
+ UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) ) ;
+#endif
+
+ if ( m_macControlIsShown )
+ UMAShowControl( (ControlHandle) m_macControl ) ;
SetCursor( *wxSTANDARD_CURSOR ) ;
}
#endif
return ;
-/*
-
- if ( (ControlHandle) m_macControl == NULL )
- {
- wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
- return ;
- }
-
- Rect oldbounds;
- int new_x, new_y, new_width, new_height;
- int mac_x, mac_y;
-
- new_x = m_x;
- new_y = m_y;
- new_width = m_width;
- new_height = m_height;
-
- if (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)
- {
- new_x = x;
- new_y = y;
- new_width = width;
- new_height = height;
- }
- else
- {
- if (x != -1) new_x = x;
- if (y != -1) new_y = y;
- if (width != -1) new_width = width;
- if (height != -1) new_height = height;
- }
-
- if(sizeFlags & wxSIZE_AUTO)
- {
- wxSize size = GetBestSize();
- if (sizeFlags & wxSIZE_AUTO_WIDTH)
- {
- if (width == -1) new_width = size.x;
- }
- if (sizeFlags & wxSIZE_AUTO_HEIGHT)
- {
- if (height == -1) new_height = size.y;
- }
- }
- AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
-
- mac_x = new_x;
- mac_y = new_y;
- if(GetParent()) {
- GetParent()->MacWindowToRootWindow(&mac_x, &mac_y);
- }
- GetControlBounds( (ControlHandle) m_macControl, &oldbounds);
- oldbounds.right = oldbounds.left + m_width;
- oldbounds.bottom = oldbounds.top + m_height;
-
- bool doMove = false;
- bool doResize = false;
-
- if ( mac_x != (oldbounds.left - m_macHorizontalBorder) ||
- mac_y != (oldbounds.top - m_macVerticalBorder) )
- {
- doMove = true ;
- }
- if ( new_width != oldbounds.right - oldbounds.left - 2 * m_macHorizontalBorder ||
- new_height != oldbounds.bottom - oldbounds.top - 2 * m_macVerticalBorder)
- {
- doResize = true ;
- }
-
- if ( doMove || doResize )
- {
- Refresh() ;
-
- // Ensure resize is within constraints
- if ((m_minWidth != -1) && (new_width < m_minWidth)) {
- new_width = m_minWidth;
- }
- if ((m_minHeight != -1) && (new_height < m_minHeight)) {
- new_height = m_minHeight;
- }
- if ((m_maxWidth != -1) && (new_width > m_maxWidth)) {
- new_width = m_maxWidth;
- }
- if ((m_maxHeight != -1) && (new_height > m_maxHeight)) {
- new_height = m_maxHeight;
- }
-
- if ( doMove )
- {
- m_x = new_x;
- m_y = new_y;
-
- UMAMoveControl( (ControlHandle) m_macControl,
- mac_x + m_macHorizontalBorder, mac_y + m_macVerticalBorder);
-
- wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event) ;
- }
- if ( doResize )
- {
- m_width = new_width;
- m_height = new_height;
-
- UMASizeControl( (ControlHandle) m_macControl,
- m_width - 2 * m_macHorizontalBorder,
- m_height - 2 * m_macVerticalBorder ) ;
-
-
- wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
- }
-
- Refresh() ;
- }
-*/
}
bool wxControl::Show(bool show)
{
controlpart = ::HandleControlClick( control , localwhere , modifiers , (ControlActionUPP) -1 ) ;
wxTheApp->s_lastMouseDown = 0 ;
- if ( control && controlpart != kControlNoPart &&
- ! IsKindOf( CLASSINFO( wxScrollBar ) )
- ) // otherwise we will get the event twice for scrollbar
+ if ( control && controlpart != kControlNoPart )
{
- MacHandleControlClick( control , controlpart ) ;
+ MacHandleControlClick( control , controlpart , false /* mouse not down anymore */ ) ;
}
}
}
return false ;
}
-void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+void wxControl::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
{
- wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
+ wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
}
projects / wxWidgets.git / blobdiff