Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 5c4da3a6252973b283a73290548dc52c4448c8a1..77fb5aefcffcd0021b2844547c194f9c994c6c0e 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1080,10 +1080,6 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
        return enc ;
 }
 
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
 
 //
 // CFStringRefs (Carbon only)
@@ -1232,9 +1228,6 @@ void wxMacConvertNewlines10To13( wxChar * data )
 // Common Event Support
 // ----------------------------------------------------------------------------
 
-#endif // wxUSE_GUI
-
-#if wxUSE_BASE
 
 extern ProcessSerialNumber gAppProcess ;
 
@@ -1281,7 +1274,7 @@ OSStatus wxMacCarbonEvent::GetParameter(EventParamName inName, EventParamType in
     return ::GetEventParameter( m_eventRef , inName , inDesiredType , NULL , inBufferSize , NULL , outData ) ;   
 }
 
-OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, void * inData)
+OSStatus wxMacCarbonEvent::SetParameter(EventParamName inName, EventParamType inType, UInt32 inBufferSize, const void * inData)
 {
     return ::SetEventParameter( m_eventRef , inName , inType , inBufferSize , inData ) ;   
 }
@@ -1305,6 +1298,40 @@ OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size
     return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData ) ;   
 }
 
+OSStatus wxMacControl::SendEvent(  EventRef event , OptionBits inOptions ) 
+{
+#if TARGET_API_MAC_OSX
+    return SendEventToEventTargetWithOptions( event, 
+        HIObjectGetEventTarget(  (HIObjectRef) m_controlRef ), inOptions );        
+#else
+    #pragma unused(inOptions) 
+    return SendEventToEventTarget(event,GetControlEventTarget( m_controlRef ) ) ;
+#endif
+}
+
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions ) 
+{
+    wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess ) ;
+    event.SetParameter<HICommand>(kEventParamDirectObject,command) ;
+    return SendEvent( event , inOptions ) ;     
+}
+
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions  ) 
+{
+    HICommand command ;
+    memset( &command, 0 , sizeof(command) ) ;
+    command.commandID = commandID ;
+    return SendHICommand( command , inOptions ) ;
+}
+
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks ) 
+{
+    HiliteControl( m_controlRef , part ) ;
+    unsigned long finalTicks ;
+    Delay( ticks , &finalTicks ) ;
+    HiliteControl( m_controlRef , kControlNoPart ) ;
+}
+
 // ----------------------------------------------------------------------------
 // debugging support
 // ----------------------------------------------------------------------------