nobody at rubyforge.org
2007-Jun-26 18:35 UTC
[Wxruby-development] [1081] trunk/wxruby2: Added HyperlinkCtrl from the 2.8 API plus event mappings
<!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>[1081] trunk/wxruby2: Added HyperlinkCtrl from the 2.8 API plus event mappings</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1081</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-06-26 14:35:28 -0400 (Tue, 26 Jun 2007)</dd> </dl> <h3>Log Message</h3> <pre>Added HyperlinkCtrl from the 2.8 API plus event mappings</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2libwxclassesevthandlerrb">trunk/wxruby2/lib/wx/classes/evthandler.rb</a></li> <li><a href="#trunkwxruby2swigclassesEventi">trunk/wxruby2/swig/classes/Event.i</a></li> <li><a href="#trunkwxruby2swigclassesincludeparentsrb">trunk/wxruby2/swig/classes/include/parents.rb</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#trunkwxruby2swigclassesHyperlinkCtrli">trunk/wxruby2/swig/classes/HyperlinkCtrl.i</a></li> <li><a href="#trunkwxruby2swigclassesHyperlinkEventi">trunk/wxruby2/swig/classes/HyperlinkEvent.i</a></li> <li><a href="#trunkwxruby2swigclassesincludewxHyperlinkCtrlh">trunk/wxruby2/swig/classes/include/wxHyperlinkCtrl.h</a></li> <li><a href="#trunkwxruby2swigclassesincludewxHyperlinkEventh">trunk/wxruby2/swig/classes/include/wxHyperlinkEvent.h</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2libwxclassesevthandlerrb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/lib/wx/classes/evthandler.rb (1080 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/lib/wx/classes/evthandler.rb        2007-06-26 17:54:51 UTC (rev 1080) +++ trunk/wxruby2/lib/wx/classes/evthandler.rb        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -285,6 +285,9 @@ </span><span class="cx"> EventType[''evt_help_range'', 2, </span><span class="cx"> Wx::EVT_HELP, </span><span class="cx"> Wx::Event], </span><ins>+ EventType[''evt_hyperlink'', 1, + Wx::EVT_COMMAND_HYPERLINK, + Wx::HyperlinkEvent], </ins><span class="cx"> EventType[''evt_iconize'', 0, </span><span class="cx"> Wx::EVT_ICONIZE, </span><span class="cx"> Wx::IconizeEvent], </span></span></pre></div> <a id="trunkwxruby2swigclassesEventi"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/swig/classes/Event.i (1080 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/Event.i        2007-06-26 17:54:51 UTC (rev 1080) +++ trunk/wxruby2/swig/classes/Event.i        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -30,6 +30,7 @@ </span><span class="cx"> #include <wx/tglbtn.h> </span><span class="cx"> #include <wx/aui/aui.h> </span><span class="cx"> #include <wx/treebook.h> </span><ins>+#include <wx/hyperlink.h> </ins><span class="cx"> </span><span class="cx"> #ifdef WXSCINTILLA </span><span class="cx"> # include <wx/wxscintilla.h> </span><span class="lines">@@ -292,6 +293,8 @@ </span><span class="cx"> %constant const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING; </span><span class="cx"> %constant const int wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED; </span><span class="cx"> </span><ins>+%constant const int wxEVT_COMMAND_HYPERLINK; // 3700 + </ins><span class="cx"> %constant const int wxEVT_WIZARD_PAGE_CHANGED; //900) </span><span class="cx"> %constant const int wxEVT_WIZARD_PAGE_CHANGING; //901) </span><span class="cx"> %constant const int wxEVT_WIZARD_CANCEL; //902) </span></span></pre></div> <a id="trunkwxruby2swigclassesHyperlinkCtrli"></a> <div class="addfile"><h4>Added: trunk/wxruby2/swig/classes/HyperlinkCtrl.i (0 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/HyperlinkCtrl.i         (rev 0) +++ trunk/wxruby2/swig/classes/HyperlinkCtrl.i        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -0,0 +1,26 @@ </span><ins>+// Copyright 2007 by Kevin Smith +// released under the MIT-like wxRuby license + +%include "../common.i" + +%module(directors="1") wxHyperlinkCtrl +GC_MANAGE_AS_WINDOW(wxHyperlinkCtrl); + +%{ +#include <wx/hyperlink.h> +%} + +#define wxHL_CONTEXTMENU 0x0001 +#define wxHL_ALIGN_LEFT 0x0002 +#define wxHL_ALIGN_RIGHT 0x0004 +#define wxHL_ALIGN_CENTRE 0x0008 +#define wxHL_DEFAULT_STYLE (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE) + +%ignore wxHyperlinkCtrl::wxHyperlinkCtrl(); + +%import "include/wxObject.h" +%import "include/wxEvtHandler.h" +%import "include/wxWindow.h" +%import "include/wxControl.h" + +%include "include/wxHyperlinkCtrl.h" </ins></span></pre></div> <a id="trunkwxruby2swigclassesHyperlinkEventi"></a> <div class="addfile"><h4>Added: trunk/wxruby2/swig/classes/HyperlinkEvent.i (0 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/HyperlinkEvent.i         (rev 0) +++ trunk/wxruby2/swig/classes/HyperlinkEvent.i        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -0,0 +1,19 @@ </span><ins>+// Copyright 2004-2007 by Kevin Smith +// released under the MIT-like wxRuby license + +%include "../common.i" + +%module(directors="1") wxHyperlinkEvent +GC_MANAGE_AS_EVENT(wxHyperlinkEvent); + +%{ +#include <wx/hyperlink.h> +%} + +%ignore wxCommandEvent::Checked; + +%import "include/wxObject.h" +%import "include/wxEvent.h" +%import "include/wxCommandEvent.h" + +%include "include/wxHyperlinkEvent.h" </ins></span></pre></div> <a id="trunkwxruby2swigclassesincludeparentsrb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/swig/classes/include/parents.rb (1080 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/include/parents.rb        2007-06-26 17:54:51 UTC (rev 1080) +++ trunk/wxruby2/swig/classes/include/parents.rb        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -150,6 +150,8 @@ </span><span class="cx"> ''wxHtmlWinParser'' => ''wxHtmlParser'', </span><span class="cx"> ''wxHtmlWinTagHandler'' => ''wxHtmlTagHandler'', </span><span class="cx"> ''wxHtmlWindow'' => ''wxScrolledWindow'', </span><ins>+ ''wxHyperlinkCtrl'' => ''wxControl'', + ''wxHyperlinkEvent'' => ''wxCommandEvent'', </ins><span class="cx"> ''wxIPV4address'' => ''wxSockAddress'', </span><span class="cx"> ''wxIconizeEvent'' => ''wxEvent'', </span><span class="cx"> ''wxIdleEvent'' => ''wxEvent'', </span></span></pre></div> <a id="trunkwxruby2swigclassesincludewxHyperlinkCtrlh"></a> <div class="addfile"><h4>Added: trunk/wxruby2/swig/classes/include/wxHyperlinkCtrl.h (0 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/include/wxHyperlinkCtrl.h         (rev 0) +++ trunk/wxruby2/swig/classes/include/wxHyperlinkCtrl.h        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -0,0 +1,53 @@ </span><ins>+// Copyright 2007 by Kevin Smith +// released under the MIT-style wxruby2 license + +#if !defined(_wxHyperlinkCtrl_h_) +#define _wxHyperlinkCtrl_h_ + + +class wxHyperlinkCtrl : public wxControl +{ +public: + // Default constructor (for two-step construction). + wxHyperlinkCtrl() { } + + // Constructor. + wxHyperlinkCtrl(wxWindow *parent, + wxWindowID id, + const wxString& label, const wxString& url, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxHL_DEFAULT_STYLE, + const wxString& name = wxHyperlinkCtrlNameStr) + { + (void)Create(parent, id, label, url, pos, size, style, name); + } + + // Creation function (for two-step construction). + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label, const wxString& url, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxHL_DEFAULT_STYLE, + const wxString& name = wxHyperlinkCtrlNameStr); + + + // get/set + wxColour GetHoverColour() const { return m_hoverColour; } + void SetHoverColour(const wxColour &colour) { m_hoverColour = colour; } + + wxColour GetNormalColour() const { return m_normalColour; } + void SetNormalColour(const wxColour &colour); + + wxColour GetVisitedColour() const { return m_visitedColour; } + void SetVisitedColour(const wxColour &colour); + + wxString GetURL() const { return m_url; } + void SetURL (const wxString &url) { m_url=url; } + + void SetVisited(bool visited = true) { m_visited=visited; } + bool GetVisited() const { return m_visited; } +}; + +#endif </ins></span></pre></div> <a id="trunkwxruby2swigclassesincludewxHyperlinkEventh"></a> <div class="addfile"><h4>Added: trunk/wxruby2/swig/classes/include/wxHyperlinkEvent.h (0 => 1081)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/include/wxHyperlinkEvent.h         (rev 0) +++ trunk/wxruby2/swig/classes/include/wxHyperlinkEvent.h        2007-06-26 18:35:28 UTC (rev 1081) </span><span class="lines">@@ -0,0 +1,24 @@ </span><ins>+// Copyright 2007 by Kevin Smith +// released under the MIT-style wxruby2 license + +#if !defined(_wxHyperlinkEvent_h_) + +#define _wxHyperlinkEvent_h_ + +class wxHyperlinkEvent : public wxCommandEvent +{ +public: + wxHyperlinkEvent(); + wxHyperlinkEvent(wxWindow* parent, wxWindowID id, const wxString& url); + +        // Returns the URL associated with the hyperlink control +        // that the user clicked on. +        wxString GetURL() const; +        void SetURL(const wxString &url); + +        // default copy ctor, assignment operator and dtor are ok +        virtual wxEvent* Clone() const; + +}; + +#endif </ins></span></pre> </div> </div> </body> </html>
Possibly Parallel Threads
- [1083] trunk/wxruby2/doc/textile/hyperlinkevent.txtl: Added HyperlinkCtrl and HyperlinkEvent documentation
- [1082] trunk/wxruby2/doc/textile/hyperlinkctrl.txtl: Added HyperlinkCtrl and HyperlinkEvent documentation
- [883] branches/wxruby2/wxwidgets_282/swig: API changes for move to WxWidgets 2.8
- [929] branches/wxruby2/wxwidgets_282/swig/classes: Fix virtual methods that shouldn''t be (Bug 9682); Add missing methods and
- [904] branches/wxruby2/wxwidgets_282: Changes in Wx::Colour API 2.6 -> 2.8