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

wxMacControl extensions, sleep implementations header corrected

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-07-03 15:49:31 +00:00
parent 37144cf0f1
commit 29d916613c
1 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/mac/carbon/utils.cpp
View File

@@ -45,6 +45,13 @@
#include <Sound.h> #include <Sound.h>
#endif #endif
#if TARGET_API_MAC_OSX
#include <CoreServices/CoreServices.h>
#else
#include <DriverServices.h>
#include <Multiprocessing.h>
#endif
#include <ATSUnicode.h> #include <ATSUnicode.h>
#include <TextCommon.h> #include <TextCommon.h>
#include <TextEncodingConverter.h> #include <TextEncodingConverter.h>
@@ -1428,12 +1435,12 @@ OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType in
// Control Access Support // Control Access Support
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
{ {
return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ; return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize ) ;
} }
OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
{ {
return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ; return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize ) ;
} }
@@ -1514,6 +1521,53 @@ void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maxi
::SetControl32BitValue( m_controlRef , value ) ; ::SetControl32BitValue( m_controlRef , value ) ;
} }
void wxMacControl::VisibilityChanged(bool shown)
{
}
void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
{
m_font = font ;
ControlFontStyleRec fontStyle;
if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
{
switch( font.MacGetThemeFontID() )
{
case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
case 109 /*mini font */ : fontStyle.font = -5 ; break ;
case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
default : fontStyle.font = kControlFontBigSystemFont ; break ;
}
fontStyle.flags = kControlUseFontMask ;
}
else
{
fontStyle.font = font.MacGetFontNum() ;
fontStyle.style = font.MacGetFontStyle() ;
fontStyle.size = font.MacGetFontSize() ;
fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
}
fontStyle.just = teJustLeft ;
fontStyle.flags |= kControlUseJustMask ;
if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
fontStyle.just = teJustCenter ;
else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
fontStyle.just = teJustRight ;
// we only should do this in case of a non-standard color, as otherwise 'disabled' controls
// won't get grayed out by the system anymore
if ( foreground != *wxBLACK )
{
fontStyle.foreColor = MAC_WXCOLORREF(foreground.GetPixel() ) ;
fontStyle.flags |= kControlUseForeColorMask ;
}
::SetControlFontStyle( m_controlRef , &fontStyle );
}
void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum ) void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
{ {
::SetControl32BitMinimum( m_controlRef , minimum ) ; ::SetControl32BitMinimum( m_controlRef , minimum ) ;