[Wxart2d-users_dev] patch for gcc 3.4.x build

[Aleksey Sanin]

I have a small patch that fixes 2 build errors
on gcc 3.4.x (Solaris AMD64). The first one was
already discussed here:

http://sourceforge.net/mailarchive/forum.php?thread_id=30141901&forum_id=19100

and I believe this is simply a gcc bug fixed in
later versions. The second one is a real error
(passing wxString object to "..."  function without
calling c_str()).

Thanks!

Aleksey Sanin







diff -ur modules/canvas/include/canglob.h modules/canvas/include/canglob.h
--- modules/canvas/include/canglob.h    Fri Mar 16 09:55:33 2007
+++ modules/canvas/include/canglob.h    Fri Mar 16 10:54:30 2007
@@ -1056,7 +1056,7 @@
 /*!
     \ingroup docalgo
 */
-template< class basetype, class a2dpropertyidtyped >
+template< class basetype, class a2dpropertyidtyped, class proptype = 
a2dPropObject >
 class a2dWalker_SetProperty: public a2dWalkerIOHandler
 {
 public:
@@ -1088,15 +1088,15 @@
 
 typedef a2dWalker_SetProperty< bool, a2dPropertyIdBool > 
a2dWalker_SetBoolProperty;
 
-template< class basetype, class a2dpropertyidtyped >
-a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::a2dWalker_SetProperty( 
basetype valueToSet, bool all )
+template< class basetype, class a2dpropertyidtyped, class proptype >
+a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype 
>::a2dWalker_SetProperty( basetype valueToSet, bool all )
 {
     m_valueToSet = valueToSet;
     m_all = all;
 }
 
-template< class basetype, class a2dpropertyidtyped >
-a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::a2dWalker_SetProperty( 
const a2dpropertyidtyped& id, basetype valueToSet, bool all )
+template< class basetype, class a2dpropertyidtyped, class proptype >
+a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype 
>::a2dWalker_SetProperty( const a2dpropertyidtyped& id, basetype valueToSet, 
bool all )
 {
     m_valueToSet = valueToSet;
     m_propertyList.push_back( (a2dPropertyId*) &id );
@@ -1103,34 +1103,34 @@
     m_all = all;
 }
 
-template< class basetype, class a2dpropertyidtyped >
-a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::~a2dWalker_SetProperty()
+template< class basetype, class a2dpropertyidtyped, class proptype >
+a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype 
>::~a2dWalker_SetProperty()
 {
 }
 
-template< class basetype, class a2dpropertyidtyped >
-void a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::AddPropertyId( 
const a2dpropertyidtyped& id )
+template< class basetype, class a2dpropertyidtyped, class proptype >
+void a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype 
>::AddPropertyId( const a2dpropertyidtyped& id )
 {
     m_propertyList.push_back( (a2dPropertyId*) &id );
 }
 
 
-template< class basetype, class a2dpropertyidtyped >
-bool a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::Start( a2dObject* 
object )
+template< class basetype, class a2dpropertyidtyped, class proptype >
+bool a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype >::Start( 
a2dObject* object )
 {
     object->Walker( NULL, *this );
     return true;
 }
 
-template< class basetype, class a2dpropertyidtyped >
-bool a2dWalker_SetProperty< basetype,a2dpropertyidtyped >::WalkTask( wxObject* 
WXUNUSED(parent), wxObject* object, a2dWalkEvent event )
+template< class basetype, class a2dpropertyidtyped, class proptype >
+bool a2dWalker_SetProperty< basetype,a2dpropertyidtyped, proptype >::WalkTask( 
wxObject* WXUNUSED(parent), wxObject* object, a2dWalkEvent event )
 {
     if ( event == a2dWalker_a2dPropObjectStart )
     {
         SetStopWalking( true );
-        if ( wxDynamicCast( object, a2dPropObject ) )
+        if ( wxDynamicCast( object, proptype ) )
         {
-            a2dPropObject* propobj = wxDynamicCast( object, a2dPropObject );
+            a2dPropObject* propobj = wxDynamicCast( object, proptype );
                forEachIn( a2dPropertyIdList, &m_propertyList )
             {
                 a2dpropertyidtyped *id = (a2dpropertyidtyped*) *iter;
diff -ur modules/docview/src/doccom.cpp modules/docview/src/doccom.cpp
--- modules/docview/src/doccom.cpp      Fri Mar 16 09:55:32 2007
+++ modules/docview/src/doccom.cpp      Fri Mar 16 11:02:04 2007
@@ -1165,7 +1165,10 @@
                 else
                     msgTitle = wxString(_("File error"));
 
-                (void)wxMessageBox(wxString::Format(_("Sorry, could not open 
the file:\n%s"),fileNotExist).c_str(), msgTitle.c_str(), wxOK | 
wxICON_EXCLAMATION,
+                (void)wxMessageBox(
+                    wxString::Format(_("Sorry, could not open the 
file:\n%s"),fileNotExist.c_str()).c_str(), 
+                    msgTitle.c_str(), 
+                    wxOK | wxICON_EXCLAMATION,
                     parent);
 
                 path = wxT("");

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Wxart2d-users_dev mailing list
Wxart2d-users_dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wxart2d-users_dev