moving to a 10.4 compatible implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/button.mm b/src/osx/cocoa/button.mm
index 54becf5d1a2beb4e2d7a6c9e786a0ed10084a457..9efc79667e75c0326f85764f91126737b88ea5f2 100644 (file)
--- a/src/osx/cocoa/button.mm
+++ b/src/osx/cocoa/button.mm
@@ -270,6 +270,23 @@ void wxWidgetCocoaImpl::PerformClick()
 
 @end
 
 
 @end
 

+static const char * disc_triangle_xpm[] = {
+"10 9 4 1",
+"   c None",
+".  c #737373",
+"+  c #989898",
+"-  c #c6c6c6",
+" .-       ",
+" ..+-     ",
+" ....+    ",
+" ......-  ",
+" .......- ",
+" ......-  ",
+" ....+    ",
+" ..+-     ",
+" .-       ",
+};
+

 @implementation wxDisclosureNSButton
 
 + (void)initialize
 @implementation wxDisclosureNSButton
 
 + (void)initialize


@@ -313,15 +330,16 @@ wxCFRef<NSImage*> downArray ;
 
 - (void) updateImage
 {
 
 - (void) updateImage
 {

+    static wxBitmap trianglebm(disc_triangle_xpm);

     if ( downArray.get() == NULL )
     {
     if ( downArray.get() == NULL )
     {

-        downArray.reset( [wxDisclosureNSButton rotateImage:[NSImage imageNamed:NSImageNameRightFacingTriangleTemplate]] );
+        downArray.reset( [wxDisclosureNSButton rotateImage:trianglebm.GetNSImage()] );

     }
     
     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else
     }
     
     if ( isOpen )
         [self setImage:(NSImage*)downArray.get()];
     else

-        [self setImage:[NSImage imageNamed:NSImageNameRightFacingTriangleTemplate]];
+        [self setImage:trianglebm.GetNSImage()];

 }
 
 + (NSImage *)rotateImage: (NSImage *)image
 }
 
 + (NSImage *)rotateImage: (NSImage *)image