nobody at rubyforge.org
2007-Mar-17 18:39 UTC
[Wxruby-development] [883] branches/wxruby2/wxwidgets_282/swig: API changes for move to WxWidgets 2.8
<!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>[883] branches/wxruby2/wxwidgets_282/swig: API changes for move to
WxWidgets 2.8</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>883</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-03-17 14:39:40 -0400 (Sat, 17 Mar
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>API changes for move to WxWidgets 2.8</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282swigFunctionsi">branches/wxruby2/wxwidgets_282/swig/Functions.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigRubyConstantsi">branches/wxruby2/wxwidgets_282/swig/RubyConstants.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigRubyEventTypesi">branches/wxruby2/wxwidgets_282/swig/RubyEventTypes.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigRubyStockObjectsi">branches/wxruby2/wxwidgets_282/swig/RubyStockObjects.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesAppi">branches/wxruby2/wxwidgets_282/swig/classes/App.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesDialogi">branches/wxruby2/wxwidgets_282/swig/classes/Dialog.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludeeventsrb">branches/wxruby2/wxwidgets_282/swig/classes/include/events.rb</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludeparentsrb">branches/wxruby2/wxwidgets_282/swig/classes/include/parents.rb</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxApph">branches/wxruby2/wxwidgets_282/swig/classes/include/wxApp.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxArtProviderh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxArtProvider.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxCheckListBoxh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxCheckListBox.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxChoiceh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxChoice.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxComboBoxh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxComboBox.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxControlh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxControl.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxControlWithItemsh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxControlWithItems.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxDCh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxDC.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxDialogh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialog.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxDirDialogh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxDirDialog.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxFileDialogh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxFileDialog.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxFontDatah">branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontData.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxFontDialogh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontDialog.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxHtmlCellh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlCell.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxHtmlContainerCellh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlContainerCell.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxHtmlWindowh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlWindow.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxListBoxh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxListBox.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxMemoryDCh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxMemoryDC.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxPanelh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxPanel.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxRadioBoxh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxRadioBox.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxTopLevelWindowh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxTopLevelWindow.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxTreeCtrlh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxTreeCtrl.h</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxWindowh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesDialogBasei">branches/wxruby2/wxwidgets_282/swig/classes/DialogBase.i</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesincludewxDialogBaseh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialogBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheswxruby2wxwidgets_282swigFunctionsi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/Functions.i (882 => 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/Functions.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/Functions.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> size_t
wxGetMultipleChoices(wxArrayInt& selections,const wxString&
message,const wxString& caption,int n, const wxString choices[],wxWindow
*parent = NULL,int x = -1, int y = -1,bool centre = TRUE,int width=150, int
height=200);
</span><span class="cx">
</span><del>-long wxGetNumberFromUser( const wxString& message,
const wxString& prompt, const wxString& caption, long value, long min
= 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos =
wxDefaultPosition);
</del><ins>+//long wxGetNumberFromUser( const wxString&
message, const wxString& prompt, const wxString& caption, long value,
long min = 0, long max = 100, wxWindow *parent = NULL, const wxPoint& pos
= wxDefaultPosition);
</ins><span class="cx">
</span><span class="cx"> wxString wxGetTextFromUser(const
wxString& message, const wxString& caption = wxT("Input
text"),
</span><span class="cx"> const wxString& default_value
= wxT(""), wxWindow *parent = NULL);
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigRubyConstantsi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/RubyConstants.i (882 => 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/RubyConstants.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/RubyConstants.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> //
----------------------------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> // Not all platforms are
currently available or supported
</span><ins>+/*
</ins><span class="cx"> enum
</span><span class="cx"> {
</span><span class="cx"> wxUNKNOWN_PLATFORM,
</span><span class="lines">@@ -85,6 +86,7 @@
</span><span class="cx"> wxPALMOS, //
PalmOS
</span><span class="cx"> wxDOS //
wxBase under MS-DOS
</span><span class="cx"> };
</span><ins>+*/
</ins><span class="cx">
</span><span class="cx"> enum { wxDefaultCoord = -1 };
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigRubyEventTypesi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/RubyEventTypes.i (882 => 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/RubyEventTypes.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/RubyEventTypes.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -7,12 +7,15 @@
</span><span class="cx">
</span><span class="cx"> %{
</span><span class="cx"> //NO_CLASS - This tells fixmodule
not to expect a class
</span><del>-
</del><span class="cx"> #include <wx/calctrl.h>
</span><span class="cx"> #include <wx/fdrepdlg.h>
</span><ins>+#include <wx/power.h>
</ins><span class="cx"> %}
</span><span class="cx">
</span><span class="cx">
</span><ins>+
+
+
</ins><span class="cx"> %constant const int
wxEVT_NULL;// 0)
</span><span class="cx"> %constant const int
wxEVT_COMMAND_BUTTON_CLICKED;// 1)
</span><span class="cx"> %constant const int
wxEVT_COMMAND_CHECKBOX_CLICKED;// 2)
</span><span class="lines">@@ -93,7 +96,10 @@
</span><span class="cx"> %constant const int
wxEVT_END_SESSION;// 403)
</span><span class="cx"> %constant const int
wxEVT_QUERY_END_SESSION;// 404)
</span><span class="cx"> %constant const int
wxEVT_ACTIVATE_APP;// 405)
</span><del>- %constant const int wxEVT_POWER;// 406)
</del><ins>+#ifdef wxHAS_POWER_EVENTS // currently Win32 only
+ %constant const int wxEVT_POWER_SUSPENDING;// 406)
+ %constant const int wxEVT_POWER_SUSPENDED;// 407)
+#endif
</ins><span class="cx"> %constant const int
wxEVT_ACTIVATE;// 409)
</span><span class="cx"> %constant const int
wxEVT_CREATE;// 410)
</span><span class="cx"> %constant const int
wxEVT_DESTROY;// 411)
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigRubyStockObjectsi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/RubyStockObjects.i (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/RubyStockObjects.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/RubyStockObjects.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -46,3 +46,4 @@
</span><span class="cx"> %constant wxCursor const*
wxSTANDARD_CURSOR;
</span><span class="cx"> %constant wxCursor const*
wxHOURGLASS_CURSOR;
</span><span class="cx"> %constant wxCursor const*
wxCROSS_CURSOR;
</span><ins>+
</ins></span></pre></div>
<a id="brancheswxruby2wxwidgets_282swigclassesAppi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/App.i (882 => 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/App.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/App.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
#endif        
</span><span class="cx">
                //
Stock objects must not be instantiated before a wxApp has started
</span><span class="cx">
                if
( result )
</span><del>-                
Init_wxRubyStockObjects();
</del><ins>+                
//                
Init_wxRubyStockObjects();
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> wxRubyApp() ;
</span><span class="cx"> virtual ~wxApp() ;
</span><span class="cx"> void Dispatch() ;
</span><del>- int FilterEvent(wxEvent& event ) ;
</del><ins>+ virtual int FilterEvent(wxEvent& event ) ;
</ins><span class="cx"> wxString GetAppName() const;
</span><span class="cx"> bool GetAuto3D() const;
</span><span class="cx"> wxString GetClassName() const;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesDialogi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/Dialog.i (882 => 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/Dialog.i        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/Dialog.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -9,5 +9,6 @@
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span><span class="cx"> %import
"include/wxWindow.h"
</span><span class="cx"> %import
"include/wxTopLevelWindow.h"
</span><ins>+%import "include/wxDialogBase.h"
</ins><span class="cx">
</span><span class="cx"> %include
"include/wxDialog.h"
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesDialogBasei"></a>
<div class="addfile"><h4>Added:
branches/wxruby2/wxwidgets_282/swig/classes/DialogBase.i (0 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/DialogBase.i        
(rev 0)
+++
branches/wxruby2/wxwidgets_282/swig/classes/DialogBase.i        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Copyright 2004-2005 by Kevin Smith
+# released under the MIT-style wxruby2 license
+
+%include "../common.i"
+
+%module(directors="1") wxDialogBase
+
+%import "include/wxObject.h"
+%import "include/wxEvtHandler.h"
+%import "include/wxWindow.h"
+%import "include/wxTopLevelWindow.h"
+
+%include "include/wxDialogBase.h"
</ins></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludeeventsrb"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/events.rb (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/events.rb        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/events.rb        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> ["EVT_FIND", 2,
"wxEVT_COMMAND_FIND"],
</span><span class="cx">
["EVT_LIST_ITEM_FOCUSED", 2,
"wxEVT_COMMAND_LIST_ITEM_FOCUSED"],
</span><span class="cx"> ["EVT_SPIN", 2,
"wxEVT_SCROLL_THUMBTRACK"],
</span><del>-["EVT_LIST_GET_INFO", 2,
"wxEVT_COMMAND_LIST_GET_INFO"],
</del><ins>+#["EVT_LIST_GET_INFO", 2,
"wxEVT_COMMAND_LIST_GET_INFO"],
</ins><span class="cx"> ["EVT_SIZE", 1,
"wxEVT_SIZE"],
</span><span class="cx"> ["EVT_RIGHT_DOWN", 1,
"wxEVT_RIGHT_DOWN"],
</span><span class="cx"> ["EVT_ENTER_WINDOW", 1,
"wxEVT_ENTER_WINDOW"],
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> ["EVT_SCROLLWIN", 1,
"0"],
</span><span class="cx"> ["EVT_LEAVE_WINDOW", 1,
"wxEVT_LEAVE_WINDOW"],
</span><span class="cx">
["EVT_COMMAND_LEFT_DCLICK", 2, "wxEVT_COMMAND_LEFT_DCLICK"],
</span><del>-["EVT_LIST_SET_INFO", 2,
"wxEVT_COMMAND_LIST_SET_INFO"],
</del><ins>+#["EVT_LIST_SET_INFO", 2,
"wxEVT_COMMAND_LIST_SET_INFO"],
</ins><span class="cx"> ["EVT_WIZARD_HELP", 2,
"wxEVT_WIZARD_HELP"],
</span><span class="cx"> ["EVT_TAB_SEL_CHANGED",
2, "wxEVT_TAB_SEL_CHANGED"],
</span><span class="cx"> ["EVT_KEY_UP", 1,
"wxEVT_KEY_UP"],
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludeparentsrb"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/parents.rb (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/parents.rb        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/parents.rb        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -57,7 +57,8 @@
</span><span class="cx">
''wxDataObjectSimple'' => ''wxDataObject'',
</span><span class="cx">
''wxDatePickerCtrl'' => ''wxControl'',
</span><span class="cx">
''wxDialUpEvent'' => ''wxEvent'',
</span><del>- ''wxDialog'' =>
''wxTopLevelWindow'',
</del><ins>+ ''wxDialogBase'' =>
''wxTopLevelWindow'',
+ ''wxDialog'' => ''wxDialogBase'',
</ins><span class="cx">
''wxDirDialog'' => ''wxDialog'',
</span><span class="cx">
''wxDocChildFrame'' => ''wxFrame'',
</span><span class="cx">
''wxDocMDIChildFrame'' =>
''wxMDIChildFrame'',
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxApph"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxApp.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxApp.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxApp.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
         *
\param wxEvent&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- int FilterEvent(wxEvent& event ) ;
</del><ins>+virtual int FilterEvent(wxEvent& event ) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief Returns the application name.
</span><span class="cx">
        */
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxArtProviderh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxArtProvider.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxArtProvider.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxArtProvider.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -1,16 +1,23 @@
</span><del>-// Copyright 2004-2005 by Kevin Smith
</del><ins>+// Copyright 2004-2007 by Kevin Smith
</ins><span class="cx"> // released under the MIT-style
wxruby2 license
</span><span class="cx">
</span><span class="cx"> #if !defined(_wxArtProvider_h_)
</span><span class="cx"> #define _wxArtProvider_h_
</span><ins>+
</ins><span class="cx"> class wxArtProvider : public
wxObject
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- static wxBitmap GetBitmap(const wxArtID& id ,
const wxArtClient& client = wxART_OTHER, const wxSize& size =
wxDefaultSize) ;
- static wxIcon GetIcon(const wxArtID& id , const wxArtClient& client
= wxART_OTHER, const wxSize& size = wxDefaultSize) ;
- static bool PopProvider() ;
- static void PushProvider(wxArtProvider* provider ) ;
- static bool RemoveProvider(wxArtProvider* provider ) ;
</del><ins>+ static bool Delete(wxArtProvider* provider);
+ static wxBitmap GetBitmap(const wxArtID& id,
+                                                        const
wxArtClient& client = wxART_OTHER,
+                                                        const
wxSize& size = wxDefaultSize);
+ static wxIcon GetIcon(const wxArtID& id,
+                                                const
wxArtClient& client = wxART_OTHER,
+                                                const
wxSize& size = wxDefaultSize);
+ static bool Insert(wxArtProvider* provider);
+ static bool Pop();
+ static void Push(wxArtProvider* provider) ;
+ static bool Remove(wxArtProvider* provider) ;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxCheckListBoxh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxCheckListBox.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxCheckListBox.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxCheckListBox.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -42,18 +42,10 @@
</span><span class="cx">
</span><span class="cx"> // override base class virtuals
</span><span class="cx"> virtual void Delete(int n);
</span><del>-
- virtual bool SetFont( const wxFont &font );
-
</del><span class="cx"> // items may be checked
</span><span class="cx"> virtual bool IsChecked(size_t
uiIndex) const;
</span><span class="cx"> virtual void Check(size_t
uiIndex, bool bCheck = true);
</span><span class="cx">
</span><del>- // return the index of the item at this position or
wxNOT_FOUND
- int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y);
}
- int HitTest(wxCoord x, wxCoord y) const { return DoHitTestItem(x, y); }
-
-
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxChoiceh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxChoice.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxChoice.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxChoice.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual int FindString(const
wxString& string );
</span><span class="cx"> virtual void *
GetClientData(int n ) const;
</span><span class="cx"> virtual wxClientData *
GetClientObject(int n ) const;
</span><del>- virtual int GetCount() const;
</del><ins>+ virtual unsigned int GetCount() const;
</ins><span class="cx"> virtual int GetSelection()
const;
</span><span class="cx"> virtual wxString GetString(int
n ) const;
</span><span class="cx"> virtual wxString
GetStringSelection() const;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxComboBoxh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxComboBox.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxComboBox.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxComboBox.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> virtual int FindString(const
wxString& string );
</span><span class="cx"> virtual void *
GetClientData(int n ) const;
</span><span class="cx"> virtual wxClientData *
GetClientObject(int n ) const;
</span><del>- virtual int GetCount() const;
</del><ins>+ virtual unsigned int GetCount() const;
</ins><span class="cx"> virtual int GetSelection()
const;
</span><span class="cx"> virtual wxString GetString(int
n ) const;
</span><span class="cx"> virtual wxString
GetStringSelection() const;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxControlh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControl.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControl.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControl.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -7,10 +7,28 @@
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> wxControl();
</span><ins>+ wxControl(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize, long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxT("control"));
+
</ins><span class="cx"> virtual ~wxControl();
</span><ins>+ bool Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize, long style = 0,
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxT("control"));
+
</ins><span class="cx"> void Command(wxCommandEvent&
event ) ;
</span><ins>+ int GetAlignment() const;
+
+ wxString GetLabelText() const;
+ virtual bool ShouldInheritColours() const;
+
</ins><span class="cx"> virtual wxString GetLabel()
const;
</span><span class="cx"> virtual void SetLabel(const
wxString& label ) ;
</span><ins>+ virtual bool SetFont(const wxFont& font);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxControlWithItemsh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControlWithItems.h (882
=> 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControlWithItems.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxControlWithItems.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> virtual int FindString(const
wxString& string ) = 0;
</span><span class="cx"> virtual void *
GetClientData(int n ) const = 0;
</span><span class="cx"> virtual wxClientData *
GetClientObject(int n ) const = 0;
</span><del>- virtual int GetCount() const = 0;
</del><ins>+ virtual unsigned int GetCount() const = 0;
</ins><span class="cx"> virtual int GetSelection() const
= 0;
</span><span class="cx"> virtual wxString GetString(int
n ) const = 0;
</span><span class="cx"> virtual wxString
GetStringSelection() const = 0;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxDCh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDC.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDC.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDC.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> const wxFont& GetFont()
const;
</span><span class="cx"> int GetLogicalFunction() ;
</span><span class="cx"> int GetMapMode() ;
</span><del>- bool GetOptimization() ;
</del><ins>+// bool GetOptimization() ;
</ins><span class="cx"> //wxPen& GetPen();
</span><span class="cx"> const wxPen& GetPen()
const;
</span><span class="cx"> virtual bool GetPixel(wxCoord
x , wxCoord y , wxColour * colour ) = 0;
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> virtual void SetFont(const
wxFont& font ) = 0;
</span><span class="cx"> virtual void
SetLogicalFunction(int function ) = 0;
</span><span class="cx"> void SetMapMode(int int ) ;
</span><del>- void SetOptimization(bool optimize ) ;
</del><ins>+// void SetOptimization(bool optimize ) ;
</ins><span class="cx"> virtual void SetPen(const
wxPen& pen ) = 0;
</span><span class="cx"> void SetTextBackground(const
wxColour& colour ) ;
</span><span class="cx"> void SetTextForeground(const
wxColour& colour ) ;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxDialogh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialog.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialog.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialog.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(_wxDialog_h_)
</span><span class="cx"> #define _wxDialog_h_
</span><del>-class wxDialog : public wxTopLevelWindow
</del><ins>+class wxDialog : public wxDialogBase
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx">
        /**
</span><span class="lines">@@ -94,25 +94,25 @@
</span><span class="cx">
         *
\param wxCommandEvent&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- virtual void OnApply(wxCommandEvent& event ) ;
</del><ins>+ //virtual void OnApply(wxCommandEvent& event ) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief
</span><span class="cx">
         *
\param wxCommandEvent&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- virtual void OnCancel(wxCommandEvent& event ) ;
</del><ins>+ //virtual void OnCancel(wxCommandEvent& event ) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief
</span><span class="cx">
         *
\param wxCommandEvent&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- virtual void OnOK(wxCommandEvent& event ) ;
</del><ins>+ //virtual void OnOK(wxCommandEvent& event ) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief The default handler for wxEVT_SYS_COLOUR_CHANGED.
</span><span class="cx">
         *
\param wxSysColourChangedEvent&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- virtual void
OnSysColourChanged(wxSysColourChangedEvent& event ) ;
</del><ins>+ //virtual void
OnSysColourChanged(wxSysColourChangedEvent& event ) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief Sets the icon for this dialog.
</span><span class="cx">
</span><span class="lines">@@ -138,16 +138,6 @@
</span><span class="cx">
</span><span class="cx"> void SetIcons(const
wxIconBundle& icons ) ;
</span><span class="cx">
        /**
</span><del>-        
* \brief This function is deprecated and doesn''t work for all ports,
just use
- to show a modal dialog instead.
-
-Allows the programmer to specify whether the dialog box is modal
(wxDialog::Show blocks control
-until the dialog is hidden) or modeless (control returns immediately).
-         *
\param const bool
-        */
-
- void SetModal(const bool flag ) ;
-        /**
</del><span class="cx">
         *
\brief
</span><span class="cx">
         *
\param int
</span><span class="cx">
        */
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxDialogBaseh"></a>
<div class="addfile"><h4>Added:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialogBase.h (0 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialogBase.h        
(rev 0)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDialogBase.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+#if !defined(_wxDialogBase_h_)
+#define _wxDialogBase_h_
+class wxDialogBase : public wxTopLevelWindow
+{
+public:
+ wxDialogBase() ;
+ virtual ~wxDialogBase() ;
+ void Centre(int direction = wxBOTH) ;
+ /**
+ * \brief Used for two-step dialog box construction. See
+ for details.
+ * \param wxWindow*
+ * \param wxWindowID
+ * \param const wxString&
+ * \param const wxPoint&
+ * \param const wxSize&
+ * \param long
+ * \param const wxString&
+ */
+
+ bool Create(wxWindow* parent , wxWindowID id , const wxString& title
, const wxPoint& pos = wxDefaultPosition, const wxSize& size =
wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name =
wxT("dialogBox")) ;
+ wxString GetTitle() const;
+ void Iconize(const bool iconize ) ;
+ bool IsIconized() const;
+ void SetIcon(const wxIcon& icon ) ;
+ void SetIcons(const wxIconBundle& icons ) ;
+ void SetTitle(const wxString& title ) ;
+ virtual bool Show(bool show = true ) ;
+
+ virtual int ShowModal()=0;
+ virtual void EndModal(int retCode )=0;
+ virtual bool IsModal()const=0;
+ void SetReturnCode(int retCode ) ;
+ int GetReturnCode() const;
+ void SetAffirmativeId(int affirmativeId);
+ int GetAffirmativeId() const;
+ void SetEscapeId(int escapeId);
+ int GetEscapeId() const;
+private:
+ void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+};
+
+
+#endif
</ins></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxDirDialogh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDirDialog.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDirDialog.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxDirDialog.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -36,16 +36,7 @@
</span><span class="cx">
        */
</span><span class="cx">
</span><span class="cx"> wxString GetMessage() const;
</span><del>-        /**
-         *
\brief Returns the dialog style.
-        */
</del><span class="cx">
</span><del>- long GetStyle() const;
-        /**
-         *
\brief Sets the message that will be displayed on the dialog.
-         *
\param const wxString&
-        */
-
</del><span class="cx"> void SetMessage(const
wxString& message ) ;
</span><span class="cx">
        /**
</span><span class="cx">
         *
\brief Sets the default path.
</span><span class="lines">@@ -54,12 +45,6 @@
</span><span class="cx">
</span><span class="cx"> void SetPath(const
wxString& path ) ;
</span><span class="cx">
        /**
</span><del>-        
* \brief Sets the dialog style. This is currently unused.
-         *
\param long
-        */
-
- void SetStyle(long style ) ;
-        /**
</del><span class="cx">
         *
\brief Shows the dialog, returning wxID_OK if the user pressed OK, and
wxOK_CANCEL
</span><span class="cx"> otherwise.
</span><span class="cx">
        */
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxFileDialogh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFileDialog.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFileDialog.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFileDialog.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -10,23 +10,6 @@
</span><span class="cx"> public:
</span><span class="cx">
        /**
</span><span class="cx">
         *
\brief Constructor. Use to show the dialog.
</span><del>-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
</del><span class="cx"> Previous versions of wxWindows
used by default
</span><span class="cx"> under MS Windows which allowed
the program to simply remember the last
</span><span class="cx"> directory where user selected the
files to open/save. This (desired)
</span><span class="lines">@@ -97,11 +80,6 @@
</span><span class="cx">
</span><span class="cx"> void
GetPaths(wxArrayString& paths ) const;
</span><span class="cx">
        /**
</span><del>-        
* \brief Returns the dialog style.
-        */
-
- long GetStyle() const;
-        /**
</del><span class="cx">
         *
\brief Returns the file dialog wildcard.
</span><span class="cx">
        */
</span><span class="cx">
</span><span class="lines">@@ -137,12 +115,6 @@
</span><span class="cx">
</span><span class="cx"> void SetPath(const
wxString& path ) ;
</span><span class="cx">
        /**
</span><del>-        
* \brief Sets the dialog style. See for details.
-         *
\param long
-        */
-
- void SetStyle(long style ) ;
-        /**
</del><span class="cx">
         *
\brief Sets the wildcard, which can contain multiple file types, for example:
</span><span class="cx">
</span><span class="cx"> ``BMP files
(*.bmp)|*.bmp|GIF files (*.gif)|*.gif"
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxFontDatah"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontData.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontData.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontData.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> The default value is black.
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- wxColour& GetColour() ;
</del><ins>+ const wxColour& GetColour() ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief Gets the font chosen by the user. If the user pressed OK
(wxFontDialog::Show returned true), this returns
</span><span class="cx"> a new font which is now
`owned'' by the application, and should be deleted
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxFontDialogh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontDialog.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontDialog.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxFontDialog.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-// Copyright 2004-2005 by Kevin Smith
</del><ins>+// Copyright 2004-2007 by Kevin Smith
</ins><span class="cx"> // released under the MIT-style
wxruby2 license
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -8,13 +8,18 @@
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> wxFontDialog() ;
</span><ins>+ wxFontDialog(wxWindow* parent , const
wxFontData& data ) ;
</ins><span class="cx"> #if !defined(__WXMAC__)
</span><span class="cx"> wxFontDialog(wxWindow* parent
) ;
</span><span class="cx"> #endif
</span><del>- wxFontDialog(wxWindow* parent , const
wxFontData& data ) ;
</del><ins>+
</ins><span class="cx"> bool Create() ;
</span><ins>+ bool Create(wxWindow* parent , const wxFontData&
data ) ;
+#if !defined(__WXMAC__)
</ins><span class="cx"> bool Create(wxWindow* parent )
;
</span><del>- bool Create(wxWindow* parent , const wxFontData&
data ) ;
</del><ins>+#endif
+
+
</ins><span class="cx"> virtual ~wxFontDialog() ;
</span><span class="cx"> const wxFontData&
GetFontData() const;
</span><span class="cx"> wxFontData& GetFontData() ;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxHtmlCellh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlCell.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlCell.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlCell.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
        */
</span><span class="cx">
</span><span class="cx"> wxHtmlCell() ;
</span><del>- virtual bool AdjustPagebreak(int * pagebreak ) ;
</del><ins>+ virtual bool AdjustPagebreak(int *
pagebreak,wxArrayInt& known_pagebreaks) const ;
</ins><span class="cx"> virtual void Draw(wxDC& dc
, int x , int y , int view_y1 , int view_y2, wxHtmlRenderingInfo info) ;
</span><span class="cx"> virtual void
DrawInvisible(wxDC& dc , int x , int y, wxHtmlRenderingInfo info ) ;
</span><span class="cx"> virtual const wxHtmlCell*
Find(int condition , const void* param ) ;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxHtmlContainerCellh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlContainerCell.h (882
=> 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlContainerCell.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlContainerCell.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -12,7 +12,8 @@
</span><span class="cx"> int GetAlignHor() const;
</span><span class="cx"> int GetAlignVer() const;
</span><span class="cx"> wxColour GetBackgroundColour()
;
</span><del>- wxHtmlCell* GetFirstCell() ;
</del><ins>+ //wxHtmlCell* GetFirstCell() ;
+ wxHtmlCell* GetFirstChild() const;
</ins><span class="cx"> int GetIndent(int ind ) const;
</span><span class="cx"> int GetIndentUnits(int ind )
const;
</span><span class="cx"> void InsertCell(wxHtmlCell
*cell ) ;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxHtmlWindowh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlWindow.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlWindow.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxHtmlWindow.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(_wxHtmlWindow_h_)
</span><span class="cx"> #define _wxHtmlWindow_h_
</span><del>-class wxHtmlWindow : public wxScrolledWindow
</del><ins>+class wxHtmlWindow : public wxScrolledWindow,public
wxHtmlWindowMouseHelper
</ins><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> wxHtmlWindow() ;
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> bool HistoryForward() ;
</span><span class="cx"> virtual bool LoadFile(const
wxFileName& filename ) ;
</span><span class="cx"> virtual bool LoadPage(const
wxString& location ) ;
</span><del>- virtual void OnCellClicked(wxHtmlCell *cell ,
wxCoord x , wxCoord y , const wxMouseEvent& event ) ;
- virtual void OnCellMouseHover(wxHtmlCell *cell , wxCoord x , wxCoord y ) ;
</del><ins>+ // virtual bool OnCellClicked(wxHtmlCell *cell ,
wxCoord x , wxCoord y , const wxMouseEvent& event ) ;
+ // virtual void OnCellMouseHover(wxHtmlCell *cell , wxCoord x , wxCoord y )
;
</ins><span class="cx"> virtual void OnLinkClicked(const
wxHtmlLinkInfo& link ) ;
</span><span class="cx"> virtual wxHtmlOpeningStatus
OnOpeningURL(wxHtmlURLType type , const wxString& url , wxString *
redirect ) const;
</span><span class="cx"> virtual void OnSetTitle(const
wxString& title ) ;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxListBoxh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxListBox.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxListBox.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxListBox.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> bool Create(wxWindow* parent ,
wxWindowID id , const wxPoint& pos , const wxSize& size , int n ,
const wxString choices[] = NULL, long style = 0, const wxValidator&
validator = wxDefaultValidator, const wxString& name =
wxT("listBox"));
</span><span class="cx"> void Deselect(int n ) ;
</span><span class="cx"> int
GetSelections(wxArrayInt& selections ) const;
</span><ins>+ int HitTest(const wxPoint& pt) const;
</ins><span class="cx"> void InsertItems(int nItems,
const wxString *items, int pos);
</span><span class="cx"> void InsertItems(const
wxArrayString& items, int pos);
</span><span class="cx"> bool Selected(int n ) const;
</span><span class="lines">@@ -35,7 +36,7 @@
</span><span class="cx"> virtual int FindString(const
wxString& string );
</span><span class="cx"> virtual void *
GetClientData(int n ) const;
</span><span class="cx"> virtual wxClientData *
GetClientObject(int n ) const;
</span><del>- virtual int GetCount() const;
</del><ins>+ virtual unsigned int GetCount() const;
</ins><span class="cx"> virtual int GetSelection()
const;
</span><span class="cx"> virtual wxString GetString(int
n ) const;
</span><span class="cx"> virtual wxString
GetStringSelection() const;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxMemoryDCh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxMemoryDC.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxMemoryDC.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxMemoryDC.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx">
         *
\param const wxBitmap&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- void SelectObject(const wxBitmap& bitmap );
</del><ins>+ void SelectObject(wxBitmap& bitmap );
+ virtual void SelectObjectAsSource(const wxBitmap& bmp);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxPanelh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxPanel.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxPanel.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxPanel.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
         *
\param const wxString&
</span><span class="cx">
        */
</span><span class="cx">
</span><del>- wxPanel(wxWindow* parent , wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxSize& size =
wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name =
wxT("panel")) ;
</del><ins>+ wxPanel(wxWindow* parent , wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxSize& size =
wxDefaultSize, long style = wxTAB_TRAVERSAL|wxNO_BORDER, const wxString&
name = wxT("panel")) ;
</ins><span class="cx">
        /**
</span><span class="cx">
         *
\brief Destructor. Deletes any child windows before deleting the physical
window.
</span><span class="cx">
        */
</span><span class="lines">@@ -42,12 +42,6 @@
</span><span class="cx">
</span><span class="cx"> bool Create(wxWindow* parent ,
wxWindowID id , const wxPoint& pos = wxDefaultPosition, const wxSize&
size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name =
wxT("panel")) ;
</span><span class="cx">
        /**
</span><del>-        
* \brief Returns a pointer to the button which is the default for this window,
or NULL.
-The default button is the one activated by pressing the Enter key.
-        */
-
- wxButton* GetDefaultItem() const;
-        /**
</del><span class="cx">
         *
\brief Sends a , which
</span><span class="cx"> in turn transfers data to the
dialog via validators.
</span><span class="cx">
        */
</span><span class="lines">@@ -59,12 +53,6 @@
</span><span class="cx">
        */
</span><span class="cx">
</span><span class="cx"> virtual void
OnSysColourChanged(wxSysColourChangedEvent& event ) ;
</span><del>-        /**
-         *
\brief Changes the default button for the panel.
-         *
\param wxButton
-        */
-
- void SetDefaultItem(wxButton *btn ) ;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxRadioBoxh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxRadioBox.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxRadioBox.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxRadioBox.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> virtual bool Enable(bool enable
= true) ;
</span><span class="cx"> virtual bool Enable(int n ,
bool enable = true) ;
</span><span class="cx"> int FindString(const
wxString& string ) const;
</span><del>- virtual int GetCount() const;
</del><ins>+ virtual unsigned int GetCount() const;
</ins><span class="cx"> virtual wxString GetLabel()
const;
</span><span class="cx"> virtual int GetSelection()
const;
</span><span class="cx"> wxString GetStringSelection()
const;
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxTopLevelWindowh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTopLevelWindow.h (882
=> 883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTopLevelWindow.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTopLevelWindow.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -14,7 +14,21 @@
</span><span class="cx">
</span><span class="cx"> // top level wnd state
</span><span class="cx"> // --------------------
</span><ins>+ /**
+ * \brief Returns a pointer to the button which is the default for this
window, or NULL.
+ The default button is the one activated by pressing the Enter key.
+ */
</ins><span class="cx">
</span><ins>+ wxWindow* GetDefaultItem() const;
+ /**
+ * \brief Changes the default item for the panel.
+ * \param wxWindow
+ */
+
+ void SetDefaultItem(wxWindow *btn ) ;
+ virtual wxString GetTitle() const;
+ virtual void SetTitle(const wxString& title ) ;
+
</ins><span class="cx"> // maximize = true =>
maximize, otherwise - restore
</span><span class="cx"> virtual void Maximize(bool
maximize = true) = 0;
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxTreeCtrlh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTreeCtrl.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTreeCtrl.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxTreeCtrl.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -365,8 +365,8 @@
</span><span class="cx"> // Only for internal use
right now, but should probably be public
</span><span class="cx"> wxTreeItemId GetNext(const
wxTreeItemId& item) const;
</span><span class="cx">
        bool
HasChildren(const wxTreeItemId& item) const;
</span><del>- // expand this item and all subitems
recursively
- void ExpandAll(const wxTreeItemId&
item);        
</del><ins>+ void ExpandAll();
+ void ExpandAllChildren(const wxTreeItemId&
item);        
</ins><span class="cx"> void AdjustMyScrollbars();
</span><span class="cx"> void Edit( const
wxTreeItemId& item );
</span><span class="cx"> void OnSetFocus( wxFocusEvent
&event );
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> void OnChar( wxKeyEvent
&event );
</span><span class="cx"> void OnMouse( wxMouseEvent
&event );
</span><span class="cx"> void OnGetToolTip(
wxTreeEvent &event );
</span><del>- virtual wxSize DoGetBestSize() const;
</del><ins>+ // virtual wxSize DoGetBestSize() const;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesincludewxWindowh"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h (882 =>
883)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h        2007-03-17
18:28:00 UTC (rev 882)
+++
branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h        2007-03-17
18:39:40 UTC (rev 883)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> #if !defined(_wxWindow_h_)
</span><span class="cx"> #define _wxWindow_h_
</span><ins>+
</ins><span class="cx"> class wxWindow : public
wxEvtHandler
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="lines">@@ -19,12 +20,13 @@
</span><span class="cx">
</span><span class="cx"> virtual void AddChild(wxWindow*
child ) ;
</span><span class="cx"> void CaptureMouse() ;
</span><ins>+
</ins><span class="cx"> void Center(int direction ) ;
</span><ins>+ void Centre(int direction = wxBOTH) ;
+
</ins><span class="cx"> void CenterOnParent(int
direction ) ;
</span><del>- void CenterOnScreen(int direction ) ;
- void Centre(int direction = wxBOTH) ;
</del><span class="cx"> void CentreOnParent(int
direction = wxBOTH) ;
</span><del>- void CentreOnScreen(int direction = wxBOTH) ;
</del><ins>+
</ins><span class="cx"> void ClientToScreen(int*
x_INOUT , int* y_INOUT ) const;
</span><span class="cx"> wxPoint ClientToScreen(const
wxPoint& pt ) const;
</span><span class="cx"> bool Close(bool force = false)
;
</span><span class="lines">@@ -47,7 +49,7 @@
</span><span class="cx"> virtual void FitInside() ;
</span><span class="cx"> virtual void Freeze() ;
</span><span class="cx"> //wxAccessible*
GetAccessible();
</span><del>- wxSize GetAdjustedBestSize() const;
</del><ins>+ wxSize GetEffectiveMinSize() const;
</ins><span class="cx"> wxColour GetBackgroundColour()
const;
</span><span class="cx"> wxSize GetBestSize() const;
</span><span class="cx"> wxCaret * GetCaret() const;
</span><span class="lines">@@ -81,7 +83,6 @@
</span><span class="cx"> wxSize GetSize() const;
</span><span class="cx"> wxSizer * GetSizer() const;
</span><span class="cx"> virtual void
GetTextExtent(const wxString& string , int * x , int * y , int * descent =
NULL, int * externalLeading = NULL, wxFont * font = NULL) const;
</span><del>- virtual wxString GetTitle() ;
</del><span class="cx"> wxToolTip* GetToolTip() const;
</span><span class="cx"> wxRegion GetUpdateRegion()
const;
</span><span class="cx"> wxValidator* GetValidator();
</span><span class="lines">@@ -170,7 +171,6 @@
</span><span class="cx"> const
wxSize& incSize=wxDefaultSize);
</span><span class="cx"> void SetSizer(wxSizer* sizer ,
bool deleteOld = true) ;
</span><span class="cx"> void SetSizerAndFit(wxSizer*
sizer , bool deleteOld = true) ;
</span><del>- virtual void SetTitle(const wxString& title ) ;
</del><span class="cx"> virtual void
SetThemeEnabled(bool enable ) ;
</span><span class="cx"> virtual void SetValidator(const
wxValidator& validator ) ;
</span><span class="cx"> void SetToolTip(const
wxString& tip ) ;
</span></span></pre>
</div>
</div>
</body>
</html>
Apparently Analagous Threads
- [950] branches/wxruby2/wxwidgets_282: Changes in GenericDirCtrl API 2.6->2.8, fix TreeItemId mapping, remove cruft
- [926] branches/wxruby2/wxwidgets_282: Update Dialog wx2.6 -> wx2.8 API, remove deprecations and cruft, update doc
- [977] branches/wxruby2/wxwidgets_282/swig/classes/include/wxScrolledWindow.h: Add missing DoPrepareDC method, remove comment cruft
- [924] branches/wxruby2/wxwidgets_282: Changes 2.6 -> 2.8 Wx API; remove deprecated methods and update doc
- [949] branches/wxruby2/wxwidgets_282: Changes in Gauge API 2.6->2.8, remove comment cruft in header
Wisdom of the Ancients
