Revision: 7300
http://mahogany.svn.sourceforge.net/mahogany/?rev=7300&view=rev
Author: vadz
Date: 2007-07-27 13:54:59 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
compilation fix for the latest wx svn after wxItemContainer changes
Modified Paths:
--------------
trunk/M/src/gui/wxMDialogs.cpp
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2007-07-27 20:54:05 UTC (rev 7299)
+++ trunk/M/src/gui/wxMDialogs.cpp 2007-07-27 20:54:59 UTC (rev 7300)
@@ -2602,7 +2602,11 @@
ms_allIdentCombos.Remove(this);
}
- virtual void Delete(int index)
+#if wxCHECK_VERSION(2, 9, 0)
+ virtual void DoDeleteOneItem(unsigned int index)
+#else
+ virtual void Delete(unsigned int index)
+#endif
{
// sync all other combos with this one
size_t count = ms_allIdentCombos.GetCount();
@@ -2614,10 +2618,20 @@
}
}
+#if wxCHECK_VERSION(2, 9, 0)
+ wxChoice::DoDeleteOneItem(index);
+#else
wxChoice::Delete(index);
+#endif
}
+#if wxCHECK_VERSION(2, 9, 0)
+ virtual int DoAppendItems(const wxArrayStringsAdapter& items,
+ void **clientData,
+ wxClientDataType type)
+#else
virtual int DoAppend(const wxString& item)
+#endif
{
// sync all other comboboxes with the one on which Append() had been
// called: be careful to avoid reentrancy which would result in the
@@ -2634,14 +2648,23 @@
{
if ( ms_allIdentCombos[n] != this )
{
- ms_allIdentCombos[n]->Append(item);
+ ms_allIdentCombos[n]->
+#if wxCHECK_VERSION(2, 9, 0)
+ DoAppendItems(items, clientData, type);
+#else
+ Append(item);
+#endif
}
}
ms_indexOfAppend = wxNOT_FOUND;
}
+#if wxCHECK_VERSION(2, 9, 0)
+ return wxChoice::DoAppendItems(items, clientData, type);
+#else
return wxChoice::DoAppend(item);
+#endif
}
private:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
