#4479: wx.ComboBox needs a SetFont method

[wxWidgets.git] / include / wx / pen.h

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 379f560c445076ab462b4b6f1bca543f799e349f..53069c51e5d05d10f352dc47af0be9abf563f6fb 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -77,7 +77,7 @@ public:
     virtual void SetJoin(wxPenJoin join) = 0;
     virtual void SetCap(wxPenCap cap) = 0;
 
     virtual void SetJoin(wxPenJoin join) = 0;
     virtual void SetCap(wxPenCap cap) = 0;
 

-    virtual wxColour& GetColour() const = 0;
+    virtual wxColour GetColour() const = 0;

     virtual wxBitmap *GetStipple() const = 0;
     virtual wxPenStyle GetStyle() const = 0;
     virtual wxPenJoin GetJoin() const = 0;
     virtual wxBitmap *GetStipple() const = 0;
     virtual wxPenStyle GetStyle() const = 0;
     virtual wxPenJoin GetJoin() const = 0;


@@ -106,7 +106,7 @@ public:
 #elif defined(__WXDFB__)
 #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXDFB__)
 #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)

-#include "wx/mac/pen.h"
+#include "wx/osx/pen.h"

 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)