Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop using deprecated method free_colors() (#652044) 

Gtkmm releases 2.7.1 in July 2005 and 2.8 in September 2005 deprecated
Gdk::Colormap::free_colors() and replaced it with
Gdk::Colormap::free_color().  The oldest distribution currently
supported is RHEL / CentOS 5.9 with gtkmm 2.10 so just unconditionally
replace.

    ANNOUNCE: gtkmm 2.7.1
    https://mail.gnome.org/archives/gnome-announce-list/2005-July/msg00025.html

    ANNOUNCE: gtkmm and glibmm 2.8
    https://mail.gnome.org/archives/gnome-announce-list/2005-September/msg00026.html

Bug #652044 - uses deprecated APIs
This commit is contained in:
Mike Fleetwood 2013-10-11 10:16:49 +01:00 committed by Curtis Gedak
parent d65fb881e2
commit 7f5ac07c3a
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Dialog_Partition_Info.cc
View File

@ -483,10 +483,10 @@ void Dialog_Partition_Info::Display_Info()
Dialog_Partition_Info::~Dialog_Partition_Info()
{
this ->get_colormap() ->free_colors( color_used, 1 ) ;
this ->get_colormap() ->free_colors( color_unused, 1 ) ;
this ->get_colormap() ->free_colors( color_text, 1 ) ;
this ->get_colormap() ->free_colors( color_partition, 1 ) ;
this ->get_colormap() ->free_color( color_used ) ;
this ->get_colormap() ->free_color( color_unused ) ;
this ->get_colormap() ->free_color( color_text ) ;
this ->get_colormap() ->free_color( color_partition ) ;
}
} //GParted

10
src/DrawingAreaVisualDisk.cc
View File

@ -441,7 +441,7 @@ void DrawingAreaVisualDisk::free_colors( std::vector<visual_partition> & visual_
{
for ( unsigned int t = 0 ; t < visual_partitions .size() ; t++ )
{
get_colormap() ->free_colors( visual_partitions[ t ] .color, 1 ) ;
get_colormap() ->free_color( visual_partitions[ t ] .color ) ;
if ( visual_partitions[ t ] .logicals .size() > 0 )
free_colors( visual_partitions[ t ] .logicals ) ;
@ -453,10 +453,10 @@ DrawingAreaVisualDisk::~DrawingAreaVisualDisk()
clear() ;
//free the allocated colors
get_colormap() ->free_colors( color_used, 1 ) ;
get_colormap() ->free_colors( color_unused, 1 ) ;
get_colormap() ->free_colors( color_unallocated, 1 ) ;
get_colormap() ->free_colors( color_text, 1 ) ;
get_colormap() ->free_color( color_used ) ;
get_colormap() ->free_color( color_unused ) ;
get_colormap() ->free_color( color_unallocated ) ;
get_colormap() ->free_color( color_text ) ;
}
} //GParted

16
src/Frame_Resizer_Base.cc
View File

@ -70,14 +70,14 @@ void Frame_Resizer_Base::init()
void Frame_Resizer_Base::set_rgb_partition_color( const Gdk::Color & color )
{
this ->get_colormap() ->free_colors( color_partition, 1 ) ;
this ->get_colormap() ->free_color( color_partition ) ;
this ->color_partition = color ;
this ->get_colormap() ->alloc_color( color_partition ) ;
}
void Frame_Resizer_Base::override_default_rgb_unused_color( const Gdk::Color & color )
{
this ->get_colormap() ->free_colors( color_unused, 1 ) ;
this ->get_colormap() ->free_color( color_unused ) ;
this ->color_unused = color ;
this ->get_colormap() ->alloc_color( color_unused ) ;
}
@ -428,12 +428,12 @@ void Frame_Resizer_Base::Draw_Resize_Grip( ArrowType arrow_type )
Frame_Resizer_Base::~Frame_Resizer_Base()
{
this ->get_colormap() ->free_colors( color_used, 1 ) ;
this ->get_colormap() ->free_colors( color_unused, 1 ) ;
this ->get_colormap() ->free_colors( color_arrow, 1 ) ;
this ->get_colormap() ->free_colors( color_background, 1 ) ;
this ->get_colormap() ->free_colors( color_partition, 1 ) ;
this ->get_colormap() ->free_colors( color_arrow_rectangle, 1 ) ;
this ->get_colormap() ->free_color( color_used ) ;
this ->get_colormap() ->free_color( color_unused ) ;
this ->get_colormap() ->free_color( color_arrow ) ;
this ->get_colormap() ->free_color( color_background ) ;
this ->get_colormap() ->free_color( color_partition ) ;
this ->get_colormap() ->free_color( color_arrow_rectangle ) ;
delete cursor_resize;
delete cursor_move;