nobody at rubyforge.org
2007-Jun-22 18:59 UTC
[Wxruby-development] [1055] trunk/wxruby2/swig/classes/ToolBar.i: Chnage methods returning ToolBarToolBase to return position of new tool;
<!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>[1055] trunk/wxruby2/swig/classes/ToolBar.i: Chnage methods returning ToolBarToolBase to return position of new tool;</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1055</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-06-22 14:59:19 -0400 (Fri, 22 Jun 2007)</dd> </dl> <h3>Log Message</h3> <pre>Chnage methods returning ToolBarToolBase to return position of new tool; ignore methods that accept this class as incoming param</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2swigclassesToolBari">trunk/wxruby2/swig/classes/ToolBar.i</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2swigclassesToolBari"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/swig/classes/ToolBar.i (1054 => 1055)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/ToolBar.i        2007-06-06 21:02:18 UTC (rev 1054) +++ trunk/wxruby2/swig/classes/ToolBar.i        2007-06-22 18:59:19 UTC (rev 1055) </span><span class="lines">@@ -8,20 +8,22 @@ </span><span class="cx"> </span><span class="cx"> %{ </span><span class="cx"> #include <wx/toolbar.h> </span><del>- -// for some reason, the api returns a wxToolBarTool, -// even though that''s not a documented class. -// fake it by saying it''s just a control -typedef wxControl wxToolBarTool ; </del><span class="cx"> %} </span><span class="cx"> </span><del>-#// for some reason, the api returns a wxToolBarTool, -#// even though that''s not a documented class. -#// fake it by saying it''s just a control -typedef wxControl wxToolBarTool; </del><span class="cx"> </span><del>-%ignore wxToolBar::AddTool(int toolId, const wxString& label, const wxBitmap& bitmap1, const wxBitmap& bitmap2 = wxNullBitmap, wxItemKind kind = wxITEM_NORMAL, const wxString& shortHelpString = "", const wxString& longHelpString = "", wxObject* clientData = NULL); </del><ins>+// +%typemap(out) wxToolBarToolBase* { + int pos_of_tool = arg1->GetToolPos($1->GetId()); + $result = INT2NUM(pos_of_tool); +} </ins><span class="cx"> </span><ins>+ +// Versions of methods that accept a ToolBarTool argument are not +// supported in wxRuby, because that class is not ported. +%ignore wxToolBar::AddTool(wxToolBarToolBase *tool); +%ignore wxToolBar::FindToolForPosition(const float x , const float y ) const; +%ignore wxToolBar::InsertTool(size_t pos, wxToolBarToolBase *tool); + </ins><span class="cx"> // VERY weird swig bug here... </span><span class="cx"> // If we have the comment, the %if, %ignore and %endif, </span><span class="cx"> // no code is generated. </span></span></pre> </div> </div> </body> </html>
Reasonably Related Threads
- [1058] trunk/wxruby2/swig: Move TB_ constants into ToolBar and add the new 2.8 ones.
- [1056] trunk/wxruby2/swig/classes/include/wxToolBar.h: Add missing param to InsertTool long version; uncomment some methods now
- [1057] trunk/wxruby2/swig/classes/include/wxToolBar.h: Add new methods from the 2.8 API
- [ wxruby-Feature Requests-20367 ] wxToolBarTool (wxToolBarToolBase) missing, thus anti-OO
- [1059] trunk/wxruby2/doc/textile/toolbar.txtl: Update ToolBar documentation to reflect recent changes in API