don't propagate wxChildFocusEvent outside of wxTLWs

[wxWidgets.git] / src / cocoa / pen.mm

diff --git a/src/cocoa/pen.mm b/src/cocoa/pen.mm
index b82e879cad28019684cfebc352d857b8ce593bf3..d133d90fcb1a219376afcc8f5093fbaf5ba9bbba 100644 (file)
--- a/src/cocoa/pen.mm
+++ b/src/cocoa/pen.mm
@@ -10,11 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
     #include "wx/pen.h"
 #ifndef WX_PRECOMP
     #include "wx/pen.h"

+    #include "wx/bitmap.h"
+    #include "wx/colour.h"

 #endif //WX_PRECOMP
 #endif //WX_PRECOMP

-#include "wx/bitmap.h"
-#include "wx/colour.h"

 
 #import <AppKit/NSColor.h>
 
 
 #import <AppKit/NSColor.h>
 


@@ -303,7 +304,7 @@ void wxPen::SetColour(const wxColour& col)
     M_PENDATA->SetColour(col);
 }
 
     M_PENDATA->SetColour(col);
 }
 

-void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     AllocExclusive();
     M_PENDATA->SetColour(wxColour(r, g, b));
 {
     AllocExclusive();
     M_PENDATA->SetColour(wxColour(r, g, b));