mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes-1.0.2' into develop

Browse Source
This commit is contained in:
qPCR4vir 2015-07-11 21:56:48 +02:00
commit 5711ce96f5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/gui/widgets/progress.hpp
View File

@ -31,7 +31,7 @@ namespace nana
void unknown(bool); void unknown(bool);
bool unknown() const; bool unknown() const;
bool stop(bool s = true); bool stop(bool s = true);
bool stoped() const; bool stopped() const;
private: private:
void attached(widget_reference, graph_reference) override; void attached(widget_reference, graph_reference) override;
void refresh(graph_reference) override; void refresh(graph_reference) override;
@ -71,7 +71,7 @@ namespace nana
void unknown(bool); void unknown(bool);
bool unknown() const; bool unknown() const;
bool stop(bool s=true); ///< request stop or cancel and return previus stop status bool stop(bool s=true); ///< request stop or cancel and return previus stop status
bool stoped() const; bool stopped() const;
}; };
}//end namespace nana }//end namespace nana
#endif #endif

6
source/gui/widgets/progress.cpp
View File

@ -89,7 +89,7 @@ namespace nana
{ {
return unknown_; return unknown_;
} }
bool trigger::stoped() const bool trigger::stopped() const
{ {
return stop_; return stop_;
} }
@ -210,9 +210,9 @@ namespace nana
{ {
return get_drawer_trigger().stop(s); return get_drawer_trigger().stop(s);
} }
bool progress::stoped() const bool progress::stopped() const
{ {
return get_drawer_trigger().stoped(); return get_drawer_trigger().stopped();
} }
//end class progress //end class progress
}//end namespace nana }//end namespace nana