X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d9d0118eacdaab7cf304ac28dd89bae0d820a72..8d4808570fced69a1bba6828d2fde4e7c1dd884f:/src/mac/carbon/control.cpp?ds=sidebyside

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index ba80650d30..6570c1303b 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -36,7 +36,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 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
@@ -60,6 +60,34 @@ pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCod
     }
 }
 
+ControlColorUPP wxMacSetupControlBackgroundUPP = 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 ;
@@ -315,6 +343,11 @@ void wxControl::MacPostControlCreate()
 
     wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
 
+	if ( wxMacSetupControlBackgroundUPP == NULL )
+	{
+		wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+	}
+	SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  
      // Adjust the controls size and position
      wxPoint pos(m_x, m_y);