Merge lp:~hikiko/nux/nux.virtual-StaticText-func into lp:nux

[Eleni Maria Stea]

minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.

minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:846
http://jenkins.qa.ubuntu.com/job/nux-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-trusty-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/107/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

This is an ABI change. Please make sure an ABI bump MP also gets proposed and merged at the same time as this one.

Unmerged revisions

846. By Eleni Maria Stea on 2014-05-02

functions that use StaticText should be virtual because we ll override them
in unity (to replace StaticText with StaticCairoText)

=== modified file 'Nux/AbstractButton.h'
--- Nux/AbstractButton.h	2011-10-18 20:00:59 +0000
+++ Nux/AbstractButton.h	2014-05-05 07:01:11 +0000
@@ -93,7 +93,7 @@
 
         @param color the text color.
     */
-    void SetLabelColor(const Color &color);
+    virtual void SetLabelColor(const Color &color);
 
     //! Get the text color.
     /*!
 
=== modified file 'Nux/Button.h'
--- Nux/Button.h	2011-10-22 06:17:42 +0000
+++ Nux/Button.h	2014-05-05 07:01:11 +0000
@@ -247,7 +247,7 @@
 
     void Initialize(const std::string &str, TextureArea* texture_area);
 
-    void BuildLayout(const std::string &str, TextureArea* texture_area);
+    virtual void BuildLayout(const std::string &str, TextureArea* texture_area);
 
     TextureArea *image_;
     Size image_minimum_size_;