Merge branch 'master' into mas-merge

Author: NoraCodes

.travis.yml

@@ -13,8 +13,10 @@ before_install:
 script:
     - cd ui-sys
     - cargo build --verbose --tests --examples
+    - xvfb-run cargo test
     - cd ../iui
     - cargo build --verbose --tests --examples
+    - xvfb-run cargo test
 after_success: |
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&

README.md

@@ -98,8 +98,3 @@ assuming either a system or local (in `./lib/`) version of `libui` is available.
 
 Note that _most of the time_, building `libui` on the fly is what you want. It does however
 require a copy of cmake, essential build tools, et cetera.
-
-## Testing Note
-Travis does not connect video devices to their testing environments, so the tests cannot be run. Therefore, the "tests" only check compilation.
-
-[libui]: https://github.com/andlabs/libui

iui/Cargo.toml

@@ -43,7 +43,7 @@ is-it-maintained-open-issues = { repository = "LeoTindall/libui-rs" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-bitflags = "0.7"
+bitflags = "1.0"
 libc = "0.2"
 failure = "0.1.1"
 ui-sys = "0.1.1"

iui/src/controls/create_macro.rs

@@ -67,8 +67,9 @@ macro_rules! define_control {
                 }
             }
 
+            /// Return the underlying pointer for this control.
             #[allow(non_snake_case)]
-            pub unsafe fn ptr(&self) -> *mut $sys_type {
+            pub fn ptr(&self) -> *mut $sys_type {
                 self.$sys_type
             }
         }

iui/src/controls/layout.rs

@@ -37,8 +37,8 @@ impl VerticalBox {
 
 impl HorizontalBox {
     /// Create a new horizontal box layout.
-    pub fn new(_ctx: &UI) -> VerticalBox {
-        VerticalBox {
+    pub fn new(_ctx: &UI) -> HorizontalBox {
+        HorizontalBox {
             uiBox: unsafe { ui_sys::uiNewHorizontalBox() },
         }
     }