nobody at rubyforge.org
2007-Mar-18 01:42 UTC
[Wxruby-development] [892] branches/wxruby2/wxwidgets_282: Change method name in 2.6 -> 2.8 API; cleanup comment cruft in header
<!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>[892] branches/wxruby2/wxwidgets_282: Change method name in 2.6 -> 2.8 API; cleanup comment cruft in header</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>892</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-03-17 21:42:19 -0400 (Sat, 17 Mar 2007)</dd> </dl> <h3>Log Message</h3> <pre>Change method name in 2.6 -> 2.8 API; cleanup comment cruft in header</pre> <h3>Modified Paths</h3> <ul> <li><a href="#brancheswxruby2wxwidgets_282doctextilebitmaptxtl">branches/wxruby2/wxwidgets_282/doc/textile/bitmap.txtl</a></li> <li><a href="#brancheswxruby2wxwidgets_282swigclassesincludewxBitmaph">branches/wxruby2/wxwidgets_282/swig/classes/include/wxBitmap.h</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="brancheswxruby2wxwidgets_282doctextilebitmaptxtl"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/doc/textile/bitmap.txtl (891 => 892)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/doc/textile/bitmap.txtl        2007-03-18 01:38:01 UTC (rev 891) +++ branches/wxruby2/wxwidgets_282/doc/textile/bitmap.txtl        2007-03-18 01:42:19 UTC (rev 892) </span><span class="lines">@@ -44,7 +44,7 @@ </span><span class="cx"> * "Bitmap#init_standard_handlers":#Bitmap_initstandardhandlers </span><span class="cx"> * "Bitmap#insert_handler":#Bitmap_inserthandler </span><span class="cx"> * "Bitmap#load_file":#Bitmap_loadfile </span><del>-* "Bitmap#ok":#Bitmap_ok </del><ins>+* "Bitmap#is_ok":#Bitmap_isok </ins><span class="cx"> * "Bitmap#remove_handler":#Bitmap_removehandler </span><span class="cx"> * "Bitmap#save_file":#Bitmap_savefile </span><span class="cx"> * "Bitmap#set_depth":#Bitmap_setdepth </span><span class="lines">@@ -458,9 +458,9 @@ </span><span class="cx"> </span><span class="cx"> "Bitmap#save_file":bitmap.html#Bitmap_savefile </span><span class="cx"> </span><del>-h3(#Bitmap_ok). Bitmap#ok </del><ins>+h3(#Bitmap_isok). Bitmap#is_ok </ins><span class="cx"> </span><del>- Boolean *ok*() </del><ins>+ Boolean *is_ok*() </ins><span class="cx"> </span><span class="cx"> Returns true if bitmap data is present. </span><span class="cx"> </span></span></pre></div> <a id="brancheswxruby2wxwidgets_282swigclassesincludewxBitmaph"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/swig/classes/include/wxBitmap.h (891 => 892)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/swig/classes/include/wxBitmap.h        2007-03-18 01:38:01 UTC (rev 891) +++ branches/wxruby2/wxwidgets_282/swig/classes/include/wxBitmap.h        2007-03-18 01:42:19 UTC (rev 892) </span><span class="lines">@@ -8,263 +8,38 @@ </span><span class="cx"> class wxBitmap : public wxGDIObject </span><span class="cx"> { </span><span class="cx"> public: </span><del>-        /** -         * \brief Default constructor. -        */ - </del><span class="cx"> wxBitmap() ; </span><del>-        /** -         * \brief Copy constructor. -         * \param const wxBitmap& -        */ - </del><span class="cx"> wxBitmap(const wxBitmap& bitmap ) ; </span><del>-        /** -         * \brief Creates a bitmap from the given data which is interpreted in platform-dependent -manner. -         * \param void* -         * \param int -         * \param int -         * \param int -         * \param int -        */ - - ; -        /** -         * \brief Creates a bitmap from an array of bits. - -You should only use this function for monochrome bitmaps ( 1) in -portable programs: in this case the parameter should contain an XBM -image. - -For other bit depths, the behaviour is platform dependent: under Windows, the -data is passed without any changes to the underlying API. -Under other platforms, only monochrome bitmaps may be created using this -constructor and should be used for creating colour -bitmaps from static data. -         * \param const char -         * \param int -         * \param int -         * \param int -        */ - - //wxBitmap(const char bits[] , int width , int height , int depth = 1); -        /** -         * \brief Creates a new bitmap. A depth of -1 indicates the depth of the current screen -or visual. Some platforms only support 1 for monochrome and -1 for the current -colour setting. -         * \param int -         * \param int -         * \param int -        */ - </del><span class="cx"> wxBitmap(int width , int height , int depth = -1) ; </span><del>-        /** -         * \brief Creates a bitmap from XPM data. -         * \param const char** -        */ - </del><span class="cx"> wxBitmap(const char** bits ) ; </span><del>-        /** -         * \brief Loads a bitmap from a file or resource. -         * \param const wxString& -         * \param long -        */ - - wxBitmap(wxString& name , wxBitmapType type=wxBITMAP_TYPE_XPM ); -        /** -         * \brief -         * \param const wxImage& -         * \param int -        */ - </del><ins>+ wxBitmap(wxString& name , wxBitmapType type=wxBITMAP_TYPE_XPM ); </ins><span class="cx"> wxBitmap(const wxImage& img , int depth = -1) ; </span><del>-        /** -         * \brief Destroys the wxBitmap object and possibly the underlying bitmap data. -Because reference counting is used, the bitmap may not actually be -destroyed at this point - only when the reference count is zero will the -data be deleted. - -If the application omits to delete the bitmap explicitly, the bitmap will be -destroyed automatically by wxWindows when the application exits. - -Do not delete a bitmap that is selected into a memory device context. -        */ - </del><span class="cx"> virtual ~wxBitmap() ; </span><del>-        /** -         * \brief Adds a handler to the end of the static list of format handlers. -         * \param wxBitmapHandler* -        */ - </del><span class="cx"> static void AddHandler(wxBitmapHandler* handler ) ; </span><del>-        /** -         * \brief Deletes all bitmap handlers. - -This function is called by wxWindows on exit. -        */ - </del><span class="cx"> static void CleanUpHandlers() ; </span><del>-        /** -         * \brief Creates an image from a platform-dependent bitmap. This preserves -mask information so that bitmaps and images can be converted back -and forth without loss in that respect. -        */ - </del><span class="cx"> wxImage ConvertToImage() ; </span><del>-        /** -         * \brief Creates the bitmap from an icon. -         * \param const wxIcon& -        */ - </del><span class="cx"> bool CopyFromIcon(const wxIcon& icon ) ; </span><del>-        /** -         * \brief Creates a fresh bitmap. If the final argument is omitted, the display depth of -the screen is used. -         * \param int -         * \param int -         * \param int -        */ - </del><span class="cx"> virtual bool Create(int width , int height , int depth = -1) ; </span><del>-        /** -         * \brief Creates a bitmap from the given data, which can be of arbitrary type. -         * \param void* -         * \param int -         * \param int -         * \param int -         * \param int -        */ - - ; -        /** -         * \brief Finds the handler with the given name. -         * \param const wxString& -        */ - </del><span class="cx"> static wxBitmapHandler* FindHandler(const wxString& name ) ; </span><del>-        /** -         * \brief Finds the handler associated with the given extension and type. -         * \param const wxString& -         * \param long -        */ - </del><span class="cx"> static wxBitmapHandler* FindHandler(const wxString& extension , long bitmapType ) ; </span><del>-        /** -         * \brief Finds the handler associated with the given bitmap type. -         * \param long -        */ - </del><span class="cx"> static wxBitmapHandler* FindHandler(long bitmapType ) ; </span><del>-        /** -         * \brief Gets the colour depth of the bitmap. A value of 1 indicates a -monochrome bitmap. -        */ - </del><span class="cx"> int GetDepth() const; </span><del>-        /** -         * \brief Returns the static list of bitmap format handlers. -        */ - </del><span class="cx"> static wxList& GetHandlers() ; </span><del>-        /** -         * \brief Gets the height of the bitmap in pixels. -        */ - </del><span class="cx"> int GetHeight() const; </span><del>-        /** -         * \brief Gets the associated palette (if any) which may have been loaded from a file -or set for the bitmap. -        */ - </del><span class="cx"> wxPalette* GetPalette() const; </span><del>-        /** -         * \brief -        */ - </del><span class="cx"> wxMask* GetMask() const; </span><del>-        /** -         * \brief Gets the width of the bitmap in pixels. -        */ - </del><span class="cx"> int GetWidth() const; </span><del>-        /** -         * \brief Returns a sub bitmap of the current one as long as the rect belongs entirely to -the bitmap. This function preserves bit depth and mask information. -         * \param const wxRect& -        */ - </del><span class="cx"> wxBitmap GetSubBitmap(const wxRect& rect ) const; </span><del>-        /** -         * \brief Adds the standard bitmap format handlers, which, depending on wxWindows -configuration, can be handlers for Windows bitmap, Windows bitmap resource, and XPM. - -This function is called by wxWindows on startup. -        */ - </del><span class="cx"> static void InitStandardHandlers() ; </span><del>-        /** -         * \brief Adds a handler at the start of the static list of format handlers. -         * \param wxBitmapHandler* -        */ - </del><span class="cx"> static void InsertHandler(wxBitmapHandler* handler ) ; </span><del>-        /** -         * \brief Loads a bitmap from a file or resource. -         * \param const wxString& -         * \param long -        */ - </del><span class="cx"> bool LoadFile(const wxString& name , wxBitmapType type ); </span><del>-        /** -         * \brief Returns true if bitmap data is present. -        */ - - bool Ok() const; -        /** -         * \brief Finds the handler with the given name, and removes it. The handler -is not deleted. -         * \param const wxString& -        */ - </del><ins>+ bool IsOk() const; </ins><span class="cx"> static bool RemoveHandler(const wxString& name ) ; </span><del>-        /** -         * \brief Saves a bitmap in the named file. -         * \param const wxString& -         * \param int -         * \param wxPalette* -        */ - </del><span class="cx"> bool SaveFile(const wxString& name , wxBitmapType type , wxPalette* palette = NULL); </span><del>-        /** -         * \brief Sets the depth member (does not affect the bitmap data). -         * \param int -        */ - </del><span class="cx"> void SetDepth(int depth ) ; </span><del>-        /** -         * \brief Sets the height member (does not affect the bitmap data). -         * \param int -        */ - </del><span class="cx"> void SetHeight(int height ) ; </span><del>-        /** -         * \brief -         * \param wxMask* -        */ - </del><span class="cx"> void SetMask(wxMask* mask ) ; </span><del>-        /** -         * \brief Sets the associated palette. -         * \param const wxPalette& -        */ - </del><span class="cx"> void SetPalette(const wxPalette& palette ) ; </span><del>-        /** -         * \brief Sets the width member (does not affect the bitmap data). -         * \param int -        */ - </del><span class="cx"> void SetWidth(int width ) ; </span><span class="cx"> }; </span><span class="cx"> </span></span></pre> </div> </div> </body> </html>