[Jahshaka-cvs] jah/jahwidgets/src/qt3/wrapper icon_view.cpp, 1.1, 1.2 icon_view.hpp, 1.1, 1.2 list_
Status: Beta
Brought to you by:
jahshaka
From: John B. <ok_...@us...> - 2007-03-27 20:16:28
|
Update of /cvsroot/jahshaka/jah/jahwidgets/src/qt3/wrapper In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25498/jahwidgets/src/qt3/wrapper Modified Files: icon_view.cpp icon_view.hpp list_view.cpp list_view.hpp Log Message: Icon/Listview improvements and delegate changes. Index: icon_view.cpp =================================================================== RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/wrapper/icon_view.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- icon_view.cpp 16 Jan 2007 10:51:30 -0000 1.1 +++ icon_view.cpp 27 Mar 2007 20:16:22 -0000 1.2 @@ -8,11 +8,11 @@ namespace jahwidgets { namespace qt3 { -iconview::iconview( widget_handle* handle ) +iconview::iconview( widget_handle handle ) : handle_(handle) { - if ( handle_ ) { - view_ = dynamic_cast<IconView*>( handle_->widget() ); + if ( handle_.valid() ) { + view_ = dynamic_cast<IconView*>( handle_.widget() ); } } @@ -23,12 +23,7 @@ widget_handle iconview::handle() const { - if ( handle_ ) { - return *handle_; - } - else { - return widget_handle(); - } + return handle_; } void iconview::update() @@ -36,6 +31,11 @@ view_->syncToDelegate(); } +void iconview::itemUpdated( int index ) +{ + view_->itemUpdated( index ); +} + void iconview::setDelegate( IconViewDelegate* d ) { view_->setDelegate( d ); Index: icon_view.hpp =================================================================== RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/wrapper/icon_view.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- icon_view.hpp 16 Jan 2007 10:51:30 -0000 1.1 +++ icon_view.hpp 27 Mar 2007 20:16:23 -0000 1.2 @@ -19,13 +19,14 @@ class WRAPPER_DECLSPEC iconview { public: - iconview( widget_handle* handle ); + iconview( widget_handle handle ); // returns false if our widget_handle is not a valid View bool valid() const; // Sync with our delegate's data void update(); + void itemUpdated( int index ); IconViewDelegate* delegate() const; void setDelegate( IconViewDelegate* ); @@ -33,7 +34,7 @@ widget_handle handle() const; private: - widget_handle* handle_; + widget_handle handle_; IconView* view_; }; Index: list_view.cpp =================================================================== RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/wrapper/list_view.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- list_view.cpp 16 Jan 2007 10:51:30 -0000 1.1 +++ list_view.cpp 27 Mar 2007 20:16:23 -0000 1.2 @@ -8,11 +8,11 @@ namespace jahwidgets { namespace qt3 { -listview::listview( widget_handle* handle ) +listview::listview( widget_handle handle ) : handle_(handle) { - if ( handle_ ) { - view_ = dynamic_cast<ListView*>( handle_->widget() ); + if ( handle_.valid() ) { + view_ = dynamic_cast<ListView*>( handle_.widget() ); } } @@ -23,12 +23,7 @@ widget_handle listview::handle() const { - if ( handle_ ) { - return *handle_; - } - else { - return widget_handle(); - } + return handle_; } void listview::update() Index: list_view.hpp =================================================================== RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/wrapper/list_view.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- list_view.hpp 16 Jan 2007 10:51:30 -0000 1.1 +++ list_view.hpp 27 Mar 2007 20:16:23 -0000 1.2 @@ -19,7 +19,7 @@ class WRAPPER_DECLSPEC listview { public: - listview( widget_handle* handle ); + listview( widget_handle handle ); // returns false if our widget_handle is not a valid ListView bool valid() const; @@ -33,7 +33,7 @@ widget_handle handle() const; private: - widget_handle* handle_; + widget_handle handle_; ListView* view_; }; |