thr3ads.net - wxruby development - [Wxruby-development] [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more [Nov 2006]

If this information is useful, please help other people find it:
Share via:
nobody at rubyforge.org
2006-Nov-21 19:59 UTC
[Wxruby-development] [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type"
content="text/html; charset=utf-8" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family:
verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;
font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid;
padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family:
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch
.binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[744] trunk/wxruby2: get_data support & mem mgmt to all
ControlWithItems types, using more</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>744</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-11-21 14:59:03 -0500 (Tue, 21 Nov
2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>get_data support & mem mgmt to all ControlWithItems types, using
more
shared stuff, added test case</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesChoicei">trunk/wxruby2/swig/classes/Choice.i</a></li>
<li><a
href="#trunkwxruby2swigclassesComboBoxi">trunk/wxruby2/swig/classes/ComboBox.i</a></li>
<li><a
href="#trunkwxruby2swigclassesListBoxi">trunk/wxruby2/swig/classes/ListBox.i</a></li>
<li><a
href="#trunkwxruby2swigsharedcontrol_with_itemsi">trunk/wxruby2/swig/shared/control_with_items.i</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a
href="#trunkwxruby2teststest_item_datarb">trunk/wxruby2/tests/test_item_data.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesChoicei"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/Choice.i (743 => 744)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/Choice.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-19
05:02:54 UTC (rev 743)
+++
trunk/wxruby2/swig/classes/Choice.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-21
19:59:03 UTC (rev 744)
</span><span class="lines">@@ -28,24 +28,15 @@
</span><span class="cx">               const
wxValidator& validator = wxDefaultValidator,
</span><span class="cx">               const wxString&
name = wxChoiceNameStr);
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> // start client_data fixes
</span><span class="cx"> %include
"../shared/control_with_items.i"
</span><span class="cx"> %markfunc wxChoice
"mark_wxControlWithItems";
</span><span class="cx"> 
</span><del>-%ignore wxChoice::GetClientData(int n) const;
-%ignore wxChoice::GetClientObject(int n) const;
</del><span class="cx"> %extend wxChoice {
</span><del>-  VALUE get_client_data(int n)
-  {
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
returnVal = (VALUE) self->GetClientData(n);
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
returnVal == NULL )
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return Qnil;
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
returnVal;
-  }
</del><ins>+  VALUE get_client_data(int n) {
wxControlWithItems_get_client_data(self, n); }
</ins><span class="cx"> }
</span><ins>+// end client_data fixes
</ins><span class="cx"> 
</span><del>-// end client_data fix
</del><span class="cx"> 
</span><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span></span></pre></div>
<a id="trunkwxruby2swigclassesComboBoxi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/ComboBox.i (743 => 744)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/ComboBox.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-19
05:02:54 UTC (rev 743)
+++
trunk/wxruby2/swig/classes/ComboBox.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-21
19:59:03 UTC (rev 744)
</span><span class="lines">@@ -20,8 +20,24 @@
</span><span class="cx">               long style = 0,
</span><span class="cx">               const
wxValidator& validator = wxDefaultValidator,
</span><span class="cx">               const wxString&
name = wxComboBoxNameStr);
</span><ins>+
+// start client_data fixes
+%include "../shared/control_with_items.i"
+%markfunc wxComboBox "mark_wxControlWithItems";
+
+%extend wxComboBox {
+  // ComboBox doesn''t convert to ControlWithItems, 
+  // so copied here from control_with_items.i
+  VALUE get_client_data(int n) 
+  {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
returnVal = (VALUE) self->GetClientData(n);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
returnVal == NULL )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return Qnil;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
returnVal;
+  }
+}
+// end client_data
fixes&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</span><del>-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</del><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span><span class="cx"> %import
"include/wxWindow.h"
</span></span></pre></div>
<a id="trunkwxruby2swigclassesListBoxi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/ListBox.i (743 => 744)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/ListBox.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-19
05:02:54 UTC (rev 743)
+++
trunk/wxruby2/swig/classes/ListBox.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-21
19:59:03 UTC (rev 744)
</span><span class="lines">@@ -11,7 +11,16 @@
</span><span class="cx"> // redundant with good type maps
</span><span class="cx"> %ignore Set(int  n , const
wxString*  choices , void **clientData = NULL) ;
</span><span class="cx"> 
</span><ins>+// start client_data fixes
+%include "../shared/control_with_items.i"
+%markfunc wxListBox "mark_wxControlWithItems";
</ins><span class="cx"> 
</span><ins>+%extend wxListBox {
+  VALUE get_client_data(int n) { wxControlWithItems_get_client_data(self, n); }
+}
+// end client_data fixes
+
+
</ins><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span><span class="cx"> %import
"include/wxWindow.h"
</span></span></pre></div>
<a id="trunkwxruby2swigsharedcontrol_with_itemsi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/shared/control_with_items.i (743 => 744)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-19
05:02:54 UTC (rev 743)
+++
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-21
19:59:03 UTC (rev 744)
</span><span class="lines">@@ -1,10 +1,27 @@
</span><span class="cx"> # Copyright 2004-2006 by Kevin
Smith
</span><span class="cx"> # Released under the MIT-style
wxruby2 license
</span><span class="cx"> 
</span><del>-// Prevents Ruby''s GC sweeping up items that
are stored as client data
-// Checks whether the C++ object is still around first...
</del><ins>+// shared code for ControlWithItems - Wx::Choice,
Wx::ComboBox etcxf
</ins><span class="cx"> 
</span><ins>+
+// First hide the old Wx definitions of these methods - which segfault
+// TODO - these are not ACTUALLY getting ignored, whether they are 
+// named by method only or with full class qualification. Perh Swig 1.3.29 bug?
+%ignore GetClientData(int n) const;
+%ignore GetClientObject(int n) const;
+%ignore SetClientObject(int  n, wxClientData * data);
+
</ins><span class="cx"> %{
</span><ins>+  // Returns a ruby object stored as client data
+  static VALUE wxControlWithItems_get_client_data(wxControlWithItems *ptr, int
n) {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
returnVal = (VALUE) ptr->GetClientData(n);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
returnVal == NULL )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return Qnil;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
returnVal;
+  }
+
+  // Prevents Ruby''s GC sweeping up items that are stored as client
data
+  // Checks whether the C++ object is still around first...
</ins><span class="cx">   static void
mark_wxControlWithItems(void* ptr) {
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
rb_obj = SWIG_RubyInstanceFor(ptr);
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
rb_ivar_get(rb_obj, rb_intern("@__swig_dead__") ) == Qtrue )
</span></span></pre></div>
<a id="trunkwxruby2teststest_item_datarb"></a>
<div class="addfile"><h4>Added:
trunk/wxruby2/tests/test_item_data.rb (0 => 744)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/tests/test_item_data.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
(rev 0)
+++
trunk/wxruby2/tests/test_item_data.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-21
19:59:03 UTC (rev 744)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+require ''test/unit''
+require ''test/unit/ui/console/testrunner''
+require ''wx''
+
+class TestApp < Wx::App
+  attr_accessor :test_class
+  def on_init
+    Test::Unit::UI::Console::TestRunner.run(self.test_class)
+  end
+end
+
+class CtrlContainerFrame < Wx::Frame
+  attr_accessor :control
+  def initialize(ctrl_class, *args)
+    super(nil, -1, ''Test '' + ctrl_class.name)
+    self.control = ctrl_class.new(self, -1, *args)
+  end
+end
+
+class TestItemData < Test::Unit::TestCase
+  def assert_retrievable_data(ctrl, n, test_value)
+    compare = Marshal.load( Marshal.dump(test_value) )
+    ctrl.set_client_data(n, test_value)
+    assert_equal(compare, ctrl.get_client_data(n) )
+    GC.start
+    assert_equal(compare, ctrl.get_client_data(n) )
+  end
+
+  def do_control_with_items_assertions(f)
+    assert_retrievable_data(f.control, 0, { ''b'' =>
''B'' })
+    assert_retrievable_data(f.control, 1, ''string item data'')
+    assert_retrievable_data(f.control, 2, 42.3)
+  end
+
+  def test_treectrl_itemdata
+    f = CtrlContainerFrame.new(Wx::TreeCtrl)
+    root = f.control.add_root(''foo'')
+
+    id = f.control.append_item(root, ''a hash'', -1, -1, { :a
=> 7 })
+    assert_equal({:a => 7 }, 
+                  f.control.get_item_data(id) )
+
+    id = f.control.prepend_item(root, ''a float'', -1, -1, 7.8)
+    assert_equal(7.8, 
+                 f.control.get_item_data(id) )
+
+    id = f.control.prepend_item(root, ''an array'', -1, -1,
%w|foo bar baz|)
+    GC.start
+    assert_equal(%w|foo bar baz|,
+                 f.control.get_item_data(id) )
+
+    f.close(true)
+  end
+
+  def test_choice_itemdata
+    f = CtrlContainerFrame.new(Wx::Choice, Wx::DEFAULT_POSITION,
+                                Wx::DEFAULT_SIZE, %w[hash string float])
+    do_control_with_items_assertions(f)
+    f.close(true)
+  end
+
+   def test_listbox_itemdata
+     f = CtrlContainerFrame.new(Wx::ListBox, Wx::DEFAULT_POSITION,
+                                 Wx::DEFAULT_SIZE, %w[hash string float])
+     do_control_with_items_assertions(f)
+     f.close(true)
+   end
+  
+   def test_combobox_itemdata
+     f = CtrlContainerFrame.new(Wx::ComboBox, '''',
Wx::DEFAULT_POSITION,
+                               Wx::DEFAULT_SIZE, %w[hash string float])
+     do_control_with_items_assertions(f)
+     f.close(true)
+   end
+end
+
+app = TestApp.new
+app.test_class = TestItemData
+app.main_loop
</ins></span></pre>
</div>
</div>

</body>
</html>
Seemingly Similar Threads

Search for more seemingly similar threads
wxruby development - Nov 2006 - [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more

[Wxruby-development] [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more

Seemingly Similar Threads

Wisdom of the Ancients
