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

trivial 'breakfast cleanups' :) 

* include/Frame_Resizer_Base.h,
  src/Frame_Resizer_Base.cc,
  src/Frame_Resizer_Extended.cc,
  src/GParted_Core.cc: trivial 'breakfast cleanups' :)
This commit is contained in:
Bart Hakvoort 2006-09-09 07:09:13 +00:00
parent 4d895659d3
commit 52eb5545ec
5 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,13 +1,20 @@
2006-09-09 Bart Hakvoort <hakvoort@cvs.gnome.org>
* include/Frame_Resizer_Base.h,
src/Frame_Resizer_Base.cc,
src/Frame_Resizer_Extended.cc,
src/GParted_Core.cc: trivial 'breakfast cleanups' :)
2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org>
* src/ext2.cc * src/ext2.cc,
src/ext3.cc src/ext3.cc,
src/fat16.cc src/fat16.cc,
src/fat32.cc src/fat32.cc,
src/jfs.cc src/jfs.cc,
src/ntfs.cc src/ntfs.cc,
src/reiser4.cc src/reiser4.cc,
src/reiserfs.cc src/reiserfs.cc,
src/xfs.cc: be a bit more verbose on errior in set_used_sectors() src/xfs.cc: be a bit more verbose on errior in set_used_sectors()
2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org> 2006-09-08 Bart Hakvoort <hakvoort@cvs.gnome.org>

2
include/Frame_Resizer_Base.h
View File

@ -76,7 +76,7 @@ protected:
std::vector<Gdk::Point> arrow_points; std::vector<Gdk::Point> arrow_points;
Gdk::Cursor *cursor_resize, *cursor_normal, *cursor_move; Gdk::Cursor *cursor_resize, *cursor_move;
int temp_x, temp_y ; int temp_x, temp_y ;
bool fixed_start; //a fixed start disables moving the start and thereby the whole move functionality.. bool fixed_start; //a fixed start disables moving the start and thereby the whole move functionality..

7
src/Frame_Resizer_Base.cc
View File

@ -52,7 +52,6 @@ void Frame_Resizer_Base::init()
color_arrow_rectangle .set( "lightgrey" ); this ->get_colormap() ->alloc_color( color_arrow_rectangle ) ; color_arrow_rectangle .set( "lightgrey" ); this ->get_colormap() ->alloc_color( color_arrow_rectangle ) ;
cursor_resize = new Gdk::Cursor( Gdk::SB_H_DOUBLE_ARROW ) ; cursor_resize = new Gdk::Cursor( Gdk::SB_H_DOUBLE_ARROW ) ;
cursor_normal = new Gdk::Cursor( Gdk::LEFT_PTR ) ;
cursor_move = new Gdk::Cursor( Gdk::FLEUR ) ; cursor_move = new Gdk::Cursor( Gdk::FLEUR ) ;
GRIP_MOVE = GRIP_LEFT = GRIP_RIGHT = false; GRIP_MOVE = GRIP_LEFT = GRIP_RIGHT = false;
@ -302,7 +301,7 @@ bool Frame_Resizer_Base::drawingarea_on_mouse_motion( GdkEventMotion * ev )
drawingarea .get_parent_window() ->set_cursor( *cursor_move ) ; drawingarea .get_parent_window() ->set_cursor( *cursor_move ) ;
//normal pointer //normal pointer
else else
drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; drawingarea .get_parent_window() ->set_cursor() ;
} }
return true; return true;
@ -347,7 +346,7 @@ bool Frame_Resizer_Base::drawingarea_on_button_release_event( GdkEventButton *ev
bool Frame_Resizer_Base::drawingarea_on_leave_notify( GdkEventCrossing *ev ) bool Frame_Resizer_Base::drawingarea_on_leave_notify( GdkEventCrossing *ev )
{ {
if ( ev ->mode != GDK_CROSSING_GRAB && ! GRIP_LEFT && ! GRIP_RIGHT && ! GRIP_MOVE ) if ( ev ->mode != GDK_CROSSING_GRAB && ! GRIP_LEFT && ! GRIP_RIGHT && ! GRIP_MOVE )
drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; drawingarea .get_parent_window() ->set_cursor() ;
return true; return true;
} }
@ -431,8 +430,6 @@ Frame_Resizer_Base::~Frame_Resizer_Base()
if ( cursor_resize ) if ( cursor_resize )
delete cursor_resize ; delete cursor_resize ;
if ( cursor_normal )
delete cursor_normal ;
if ( cursor_move ) if ( cursor_move )
delete cursor_move ; delete cursor_move ;
} }

2
src/Frame_Resizer_Extended.cc
View File

@ -144,7 +144,7 @@ bool Frame_Resizer_Extended::drawingarea_on_mouse_motion( GdkEventMotion * ev )
drawingarea .get_parent_window() ->set_cursor( *cursor_resize ) ; drawingarea .get_parent_window() ->set_cursor( *cursor_resize ) ;
//normal pointer //normal pointer
else else
drawingarea .get_parent_window() ->set_cursor( *cursor_normal ) ; drawingarea .get_parent_window() ->set_cursor() ;
} }
return true ; return true ;

4
src/GParted_Core.cc
View File

@ -407,7 +407,7 @@ std::vector<Glib::ustring> GParted_Core::get_disklabeltypes()
PedDiskType *disk_type ; PedDiskType *disk_type ;
for ( disk_type = ped_disk_type_get_next( NULL ) ; disk_type ; disk_type = ped_disk_type_get_next( disk_type ) ) for ( disk_type = ped_disk_type_get_next( NULL ) ; disk_type ; disk_type = ped_disk_type_get_next( disk_type ) )
if ( static_cast<Glib::ustring>( disk_type->name ) != "msdos" ) if ( Glib::ustring( disk_type->name ) != "msdos" )
disklabeltypes .push_back( disk_type->name ) ; disklabeltypes .push_back( disk_type->name ) ;
return disklabeltypes ; return disklabeltypes ;
@ -510,7 +510,7 @@ void GParted_Core::read_mountpoints_from_file( const Glib::ustring & filename,
while ( getline( file, line ) ) while ( getline( file, line ) )
if ( Glib::str_has_prefix( line, "/" ) && if ( Glib::str_has_prefix( line, "/" ) &&
sscanf( line .c_str(), "%255s %255s", node, mountpoint ) == 2 && sscanf( line .c_str(), "%255s %255s", node, mountpoint ) == 2 &&
static_cast<Glib::ustring>( node ) != "/dev/root" ) Glib::ustring( node ) != "/dev/root" )
{ {
line = mountpoint ; line = mountpoint ;