nobody at rubyforge.org
2007-Jul-04 19:00 UTC
[Wxruby-development] [1103] trunk/wxruby2: Added 2.8 methods to StaticBitmap & document them; cleanup header file
<!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>[1103] trunk/wxruby2: Added 2.8 methods to StaticBitmap &
document them; cleanup header file</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1103</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-04 15:00:47 -0400 (Wed, 04 Jul
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added 2.8 methods to StaticBitmap & document them; cleanup header
file</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2doctextilestaticbitmaptxtl">trunk/wxruby2/doc/textile/staticbitmap.txtl</a></li>
<li><a
href="#trunkwxruby2swigclassesincludewxStaticBitmaph">trunk/wxruby2/swig/classes/include/wxStaticBitmap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2doctextilestaticbitmaptxtl"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/doc/textile/staticbitmap.txtl (1102 => 1103)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/doc/textile/staticbitmap.txtl        2007-07-04
18:53:17 UTC (rev 1102)
+++
trunk/wxruby2/doc/textile/staticbitmap.txtl        2007-07-04
19:00:47 UTC (rev 1103)
</span><span class="lines">@@ -38,7 +38,9 @@
</span><span class="cx"> *
"StaticBitmap.new":#StaticBitmap_new
</span><span class="cx"> *
"StaticBitmap#create":#StaticBitmap_create
</span><span class="cx"> *
"StaticBitmap#get_bitmap":#StaticBitmap_getbitmap
</span><ins>+* "StaticIcon#get_icon":#StaticBitmap_geticon
</ins><span class="cx"> *
"StaticBitmap#set_bitmap":#StaticBitmap_setbitmap
</span><ins>+* "StaticIcon#set_icon":#StaticBitmap_seticon
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -47,7 +49,7 @@
</span><span class="cx"> h3(#StaticBitmap_constr).
StaticBitmap.new
</span><span class="cx">
</span><span class="cx">
*StaticBitmap.new*(%(arg-type)Window% parent, %(arg-type)Integer% id,
%(arg-type)Bitmap% label,
</span><del>- %(arg-type)Point% pos,
</del><ins>+ %(arg-type)Point% pos =
DEFAULT_POSITION,
</ins><span class="cx">
%(arg-type)Size% size = DEFAULT_SIZE,
</span><span class="cx">
%(arg-type)Integer% style = 0,
</span><span class="cx">
%(arg-type)String% name = "staticBitmap")
</span><span class="lines">@@ -72,7 +74,7 @@
</span><span class="cx"> h3(#StaticBitmap_create).
StaticBitmap#create
</span><span class="cx">
</span><span class="cx"> Boolean
*create*(%(arg-type)Window% parent, %(arg-type)Integer% id, %(arg-type)Bitmap%
label,
</span><del>- %(arg-type)Point% pos,
</del><ins>+ %(arg-type)Point% pos =
DEFAULT_POSITION,
</ins><span class="cx"> %(arg-type)Size%
size = DEFAULT_SIZE,
</span><span class="cx">
%(arg-type)Integer% style = 0,
</span><span class="cx">
%(arg-type)String% name = "staticBitmap")
</span><span class="lines">@@ -84,13 +86,28 @@
</span><span class="cx">
</span><span class="cx"> "Bitmap":bitmap.html
*get_bitmap*()
</span><span class="cx">
</span><del>-Returns a reference to the label bitmap.
</del><ins>+Returns the bitmap currently used in the control. Notice
that this method can
+be called even if "set_icon":#StaticBitmap_seticon had been used.
</ins><span class="cx">
</span><span class="cx"> h4. See also
</span><span class="cx">
</span><span class="cx">
"StaticBitmap#set_bitmap":staticbitmap.html#StaticBitmap_setbitmap
</span><span class="cx">
</span><span class="cx">
</span><ins>+h3(#StaticBitmap_geticon). StaticIcon#get_icon
+
+ "Icon":icon.html *get_icon*()
+
+Returns the icon currently used in the control. Notice that this method can
+only be called if "set_icon":#StaticBitmap_seticon had been used: an
icon
+can''t be retrieved from the control if a bitmap had been set (using
+"set_bitmap":#StaticBitmap_setbitmap).
+
+h4. See also
+
+"StaticIcon#set_icon":staticicon.html#StaticIcon_seticon
+
+
</ins><span class="cx"> h3(#StaticBitmap_setbitmap).
StaticBitmap#set_bitmap
</span><span class="cx">
</span><span class="cx"> *set_bitmap*(%(arg-type)Bitmap%
label)
</span><span class="lines">@@ -105,3 +122,18 @@
</span><span class="cx">
</span><span class="cx">
"StaticBitmap#get_bitmap":staticbitmap.html#StaticBitmap_getbitmap
</span><span class="cx">
</span><ins>+
+h3(#StaticBitmap_seticon). StaticIcon#set_icon
+
+ *set_icon*(%(arg-type)Icon% label)
+
+Sets the label to the given icon.
+
+h4. Parameters
+
+* _label_ The new icon.
+
+h4. See also
+
+"StaticIcon#get_icon":staticicon.html#StaticIcon_geticon
+
</ins></span></pre></div>
<a id="trunkwxruby2swigclassesincludewxStaticBitmaph"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/include/wxStaticBitmap.h (1102 => 1103)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/include/wxStaticBitmap.h        2007-07-04
18:53:17 UTC (rev 1102)
+++
trunk/wxruby2/swig/classes/include/wxStaticBitmap.h        2007-07-04
19:00:47 UTC (rev 1103)
</span><span class="lines">@@ -1,53 +1,30 @@
</span><del>-// wxStaticBitmap.h
-// This file was automatically generated
-// by extractxml.rb, part of the wxRuby project
-// Do not make changes directly to this file!
</del><ins>+// Copyright 2006 - 2007 by Kevin Smith
+// released under the MIT-style wxruby2 license
</ins><span class="cx">
</span><span class="cx"> #if !defined(_wxStaticBitmap_h_)
</span><span class="cx"> #define _wxStaticBitmap_h_
</span><span class="cx"> class wxStaticBitmap : public
wxControl
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>-        /**
-         *
\brief Default constructor.
-        */
-
</del><span class="cx"> wxStaticBitmap() ;
</span><del>-        /**
-         *
\brief Constructor, creating and showing a text control.
-         *
\param wxWindow*
-         *
\param wxWindowID
-         *
\param const wxBitmap&
-         *
\param const wxPoint&
-         *
\param const wxSize&
-         *
\param long
-         *
\param const wxString&
-        */
-
- wxStaticBitmap(wxWindow* parent , wxWindowID id , const wxBitmap&
label , const wxPoint& pos , const wxSize& size = wxDefaultSize, long
style = 0, const wxString& name = wxT("staticBitmap")) ;
-        /**
-         *
\brief Creation function, for two-step construction. For details see .
-         *
\param wxWindow*
-         *
\param wxWindowID
-         *
\param const wxBitmap&
-         *
\param const wxPoint&
-         *
\param const wxSize&
-         *
\param long
-         *
\param const wxString&
-        */
-
- bool Create(wxWindow* parent , wxWindowID id , const wxBitmap& label ,
const wxPoint& pos , const wxSize& size = wxDefaultSize, long style =
0, const wxString& name = wxT("staticBitmap")) ;
-        /**
-         *
\brief Returns a reference to the label bitmap.
-        */
-
</del><ins>+ wxStaticBitmap(wxWindow* parent,
+                                
wxWindowID id,
+                                
const wxBitmap& label,
+                                
const wxPoint& pos = wxDefaultPosition,
+                                
const wxSize& size = wxDefaultSize,
+                                
long style = 0,
+                                
const wxString& name = wxT("staticBitmap"));
+ bool Create(wxWindow* parent ,
+                        
wxWindowID id,
+                        
const wxBitmap& label,
+                        
const wxPoint& pos = wxDefaultPosition,
+                        
const wxSize& size = wxDefaultSize,
+                        
long style = 0,
+                        
const wxString& name = wxT("staticBitmap"));
</ins><span class="cx"> wxBitmap GetBitmap() const;
</span><del>-        /**
-         *
\brief Sets the bitmap label.
-         *
\param const wxBitmap&
-        */
-
- virtual void SetBitmap(const wxBitmap& label ) ;
</del><ins>+ wxIcon GetIcon() const;
+ virtual void SetBitmap(const wxBitmap& label);
+ virtual void SetIcon(const wxIcon& label);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [1116] trunk/wxruby2/samples/bigdemo/wxStaticBitmap.rbw: Fix hardcoded image paths, tidy up indenting
- [893] branches/wxruby2/wxwidgets_282: New hover bitmap methods in 2.6 -> 2.8 API
- [1056] trunk/wxruby2/swig/classes/include/wxToolBar.h: Add missing param to InsertTool long version; uncomment some methods now
- [996] branches/wxruby2/wxwidgets_282: TopLevelWindow: add some 2.8 methods; document; add missing CentreOnScreen
- [883] branches/wxruby2/wxwidgets_282/swig: API changes for move to WxWidgets 2.8
Wisdom of the Ancients
