Patch to address trunk build failure on Cocoa/OS X 10.4

[Julian Scheid]

Hi,

this is just a heads up that the trunk I checked out of your repository
as of today, July 1, 8.30 UTC, wouldn't build on my Powerbook G4
running OS X 10.4:

$ uname -a
Darwin powerbook-2.local 8.8.0 Darwin Kernel Version 8.8.0: Fri Sep  8
17:18:57
PDT 2006; root:xnu-792.12.6.obj~1/RELEASE_PPC Power Macintosh powerpc

...with XCode 2.4.1 and using the following configure line:

  ./configure \
     --with-cocoa --with-opengl --disable-shared \
     --enable-unicode --enable-monolithic --enable-exceptions \
     --disable-stc

I've made the attached changes to make it build (and the changes to
Makefile.in to make a sample build). I'm totally new to wxWidgets and so
I'm not suggesting that these changes are the best way to fix the
problem, not even that they are working at runtime... just saying that
there's something fishy in those lines and you might want to take a
closer look at it.

Also note that I had to --disable-stc because of a namespace clash
between Point in Carbon's MacTypes.h and Point in Scintilla's Platform.h
(same goes for "Style").

Julian
-------------- next part --------------
Index: Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile.in	(revision 46775)
+++ Makefile.in	(working copy)
@@ -1841,6 +1841,7 @@
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1856,6 +1857,7 @@
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1871,11 +1873,13 @@
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
 @COND_TOOLKIT_GTK at BASE_MACOSX_HDR =3D $(COND_TOOLKIT_GTK_BASE_MACOSX_HDR)
 COND_TOOLKIT_MAC_BASE_MACOSX_HDR =3D  \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h \
@@ -1896,6 +1900,7 @@
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
@@ -1911,6 +1916,7 @@
 	wx/unix/private.h \
 	wx/unix/stackwalk.h \
 	wx/unix/stdpaths.h \
+	wx/mac/corefoundation/cfref.h \
 	wx/mac/corefoundation/cfstring.h \
 	wx/mac/corefoundation/hid.h \
 	wx/mac/corefoundation/stdpaths.h
Index: src/html/m_hline.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- src/html/m_hline.cpp	(revision 46775)
+++ src/html/m_hline.cpp	(working copy)
@@ -54,8 +54,8 @@
                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                           wxHtmlRenderingInfo& WXUNUSED(info))
 {
-    wxBrush mybrush(wxT("GREY"), (m_HasShading) ? wxTRANSPARENT : wxSOLID);
-    wxPen mypen(wxT("GREY"), 1, wxSOLID);
+    wxBrush mybrush(wxTheColourDatabase->Find(wxT("GREY")), (m_HasShading)=
 ? wxTRANSPARENT : wxSOLID);
+    wxPen mypen(wxTheColourDatabase->Find(wxT("GREY")), 1, wxSOLID);
     dc.SetBrush(mybrush);
     dc.SetPen(mypen);
     dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height);
Index: src/common/strconv.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- src/common/strconv.cpp	(revision 46775)
+++ src/common/strconv.cpp	(working copy)
@@ -3416,7 +3416,7 @@
         if ( m_name || ( m_encoding <=3D wxFONTENCODING_UTF16 ) )
         {
 #if wxUSE_FONTMAP
-            wxMBConv_cocoa *conv =3D m_name ? new wxMBConv_cocoa(m_name)
+          wxMBConv_cocoa *conv =3D m_name ? new wxMBConv_cocoa(wxSafeConve=
rtMB2WX(m_name))
                                           : new wxMBConv_cocoa(m_encoding);
 #else
             wxMBConv_cocoa *conv =3D new wxMBConv_cocoa(m_encoding);
Index: src/generic/treectlg.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- src/generic/treectlg.cpp	(revision 46775)
+++ src/generic/treectlg.cpp	(working copy)
@@ -850,7 +850,7 @@
     if (!m_hasFont)
         SetOwnFont(attr.font);
 =

-    m_dottedPen =3D wxPen( wxT("grey"), 0, 0 );
+    m_dottedPen =3D wxPen( wxTheColourDatabase->Find(wxT("grey")), 0, 0 );
 =

     SetInitialSize(size);
=20