A few bugs and minor improvements

.gitignore

@@ -1,30 +1,32 @@
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Libraries
-*.lib
-*.a
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-
-# KDevelop
-*.kdev4*
-
-# Build
-bin/
-build/
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# KDevelop
+*.kdev4*
+
+# Build
+bin/
+build/
+Debug/
+Release/

Android.mk

@@ -1,21 +1,21 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-SDL_PATH := ../SDL
-SDL_TTF_PATH := ../SDL_ttf
-
-LOCAL_MODULE := KiWi_static
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(SDL_TTF_PATH)
-
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/src
-
-LOCAL_SRC_FILES := \
-  $(subst $(LOCAL_PATH)/,, \
-  $(wildcard $(LOCAL_PATH)/src/*.c))
-
-LOCAL_MODULE_FILENAME := libKiWi
-
-LOCAL_STATIC_LIBRARIES := SDL2_static SDL2_ttf_static
-
-include $(BUILD_STATIC_LIBRARY)
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+SDL_PATH := ../SDL
+SDL_TTF_PATH := ../SDL_ttf
+
+LOCAL_MODULE := KiWi_static
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(SDL_TTF_PATH)
+  
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/src
+
+LOCAL_SRC_FILES := \
+  $(subst $(LOCAL_PATH)/,, \
+  $(wildcard $(LOCAL_PATH)/src/*.c))
+
+LOCAL_MODULE_FILENAME := libKiWi
+
+LOCAL_STATIC_LIBRARIES := SDL2_static SDL2_ttf_static
+
+include $(BUILD_STATIC_LIBRARY)

CMakeLists.txt

@@ -1,64 +1,64 @@
-project(KiWi)
-cmake_minimum_required(VERSION 2.8)
-
-# Point to our own cmake modules
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-modules)
-
-# Define this as top-level
-set(KIWI_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src)
-
-# Add global definitions
-add_definitions("-Wno-unused-functions -Wall")
-
-# Add Debug definitions
-set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
-
-option(DEBUG_GEOMETRY_CHANGE "Print a lot of messages when calculating composed geometries" OFF)
-if (DEBUG_GEOMETRY_CHANGE)
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG_GEOMETRY_CHANGE")
-endif()
-
-option(DEBUG_PRINT_GEOMETRY_RECTANGLE "Display composed geometry rectangles of widgets" OFF)
-if (DEBUG_PRINT_GEOMETRY_RECTANGLE)
-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG_PRINT_GEOMETRY_RECTANGLE")
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCC)
-  set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -fvisibility=hidden -std=c89 -pedantic-errors")
-endif(CMAKE_COMPILER_IS_GNUCC)
-
-# Add subdirectories
-add_subdirectory(src)
-add_subdirectory(examples)
-
-# Install KiWiConfig stuff
-set(INCLUDE_INSTALL_DIR include/KiWi)
-set(LIB_INSTALL_DIR lib)
-export(PACKAGE KiWi)
-if (UNIX)
-  set(CMAKECONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}" CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
-elseif(WIN32)
-  set(CMAKECONFIG_INSTALL_DIR "cmake"  CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
-elseif(APPLE)
-  set(CMAKECONFIG_INSTALL_DIR "cmake" CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
-endif()
-
-include(CMakePackageConfigHelpers)
-configure_package_config_file(KiWiConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/tmpkiwiconfig
-                              INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-                              PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
-write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/KiWiConfigVersion.cmake
-                                 VERSION 0.0.1
-                                 COMPATIBILITY SameMajorVersion)
-
-install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/KiWiConfigVersion.cmake
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
-
-install(FILES       
-        ${CMAKE_CURRENT_BINARY_DIR}/tmpkiwiconfig
-        RENAME KiWiConfig.cmake
-        DESTINATION ${CMAKECONFIG_INSTALL_DIR} )
-
-# install KiWiTargets.cmake
-install(EXPORT KiWiTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+project(KiWi)
+cmake_minimum_required(VERSION 2.8)
+
+# Point to our own cmake modules
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-modules)
+
+# Define this as top-level
+set(KIWI_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src)
+
+# Add global definitions
+add_definitions("-Wno-unused-functions -Wall")
+
+# Add Debug definitions
+set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+
+option(DEBUG_GEOMETRY_CHANGE "Print a lot of messages when calculating composed geometries" OFF)
+if (DEBUG_GEOMETRY_CHANGE)
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG_GEOMETRY_CHANGE")
+endif()
+
+option(DEBUG_PRINT_GEOMETRY_RECTANGLE "Display composed geometry rectangles of widgets" OFF)
+if (DEBUG_PRINT_GEOMETRY_RECTANGLE)
+  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG_PRINT_GEOMETRY_RECTANGLE")
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_C_FLAGS " ${CMAKE_C_FLAGS} -fvisibility=hidden -std=c89 -pedantic-errors")
+endif(CMAKE_COMPILER_IS_GNUCC)
+
+# Add subdirectories
+add_subdirectory(src)
+add_subdirectory(examples)
+
+# Install KiWiConfig stuff
+set(INCLUDE_INSTALL_DIR include/KiWi)
+set(LIB_INSTALL_DIR lib)
+export(PACKAGE KiWi)
+if (UNIX)
+  set(CMAKECONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}" CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
+elseif(WIN32)
+  set(CMAKECONFIG_INSTALL_DIR "cmake"  CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
+elseif(APPLE)
+  set(CMAKECONFIG_INSTALL_DIR "cmake" CACHE STRING "Where ${PROJECT_NAME}-config.cmake and companions will be installed")
+endif()
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(KiWiConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/tmpkiwiconfig
+                              INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+                              PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR)
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/KiWiConfigVersion.cmake
+                                 VERSION 0.0.1
+                                 COMPATIBILITY SameMajorVersion)
+                                 
+install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/KiWiConfigVersion.cmake
+        DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+        
+install(FILES       
+        ${CMAKE_CURRENT_BINARY_DIR}/tmpkiwiconfig
+        RENAME KiWiConfig.cmake
+        DESTINATION ${CMAKECONFIG_INSTALL_DIR} )
+
+# install KiWiTargets.cmake
+install(EXPORT KiWiTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR})

KiWi.vcxproj

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{32485B92-3CFD-4645-A5AA-E21A2479B9E4}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>KiWi</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\SDL\include;$(SolutionDir)\SDL_image;$(SolutionDir)\SDL_ttf;</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\KW_button.c" />
+    <ClCompile Include="src\KW_editbox.c" />
+    <ClCompile Include="src\KW_editbox_internal.c" />
+    <ClCompile Include="src\KW_eventwatcher.c" />
+    <ClCompile Include="src\KW_frame.c" />
+    <ClCompile Include="src\KW_frame_internal.c" />
+    <ClCompile Include="src\KW_gui.c" />
+    <ClCompile Include="src\KW_label.c" />
+    <ClCompile Include="src\KW_label_internal.c" />
+    <ClCompile Include="src\KW_scrollbox.c" />
+    <ClCompile Include="src\KW_scrollbox_internal.c" />
+    <ClCompile Include="src\KW_tilerenderer.c" />
+    <ClCompile Include="src\KW_widget.c" />
+    <ClCompile Include="src\KW_widget_eventhandlers.c" />
+    <ClCompile Include="src\utf8.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\KW_button.h" />
+    <ClInclude Include="src\KW_button_internal.h" />
+    <ClInclude Include="src\KW_editbox.h" />
+    <ClInclude Include="src\KW_editbox_internal.h" />
+    <ClInclude Include="src\KW_eventwatcher.h" />
+    <ClInclude Include="src\KW_frame.h" />
+    <ClInclude Include="src\KW_frame_internal.h" />
+    <ClInclude Include="src\KW_gui.h" />
+    <ClInclude Include="src\KW_gui_internal.h" />
+    <ClInclude Include="src\KW_label.h" />
+    <ClInclude Include="src\KW_label_internal.h" />
+    <ClInclude Include="src\KW_macros.h" />
+    <ClInclude Include="src\KW_scrollbox.h" />
+    <ClInclude Include="src\KW_scrollbox_internal.h" />
+    <ClInclude Include="src\KW_tilerenderer.h" />
+    <ClInclude Include="src\KW_widget.h" />
+    <ClInclude Include="src\KW_widget_internal.h" />
+    <ClInclude Include="src\utf8.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

KiWiConfig.cmake.in

@@ -1,16 +1,16 @@
-set(KiWi_VERSION "@KIWI_VERSION@")
-set(KIWI_VERSION "@KIWI_VERSION@")
-
-@PACKAGE_INIT@
-
-set_and_check(KIWI_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
-set_and_check(KIWI_LIBRARY_DIR "@PACKAGE_LIB_INSTALL_DIR@")
-
-if (NOT TARGET KiWi)
-  include(${CMAKE_CURRENT_LIST_DIR}/KiWiTargets.cmake)
-endif()
-
-set(KIWI_LIBRARY KiWi)
-set(KiWi_LIBRARY ${KIWI_LIBRARY})
-set(KiWi_LIBRARY_DIR ${KIWI_LIBRARY_DIR})
-set(KiWi_INCLUDE_DIR ${KIWI_INCLUDE_DIR})
+set(KiWi_VERSION "@KIWI_VERSION@")
+set(KIWI_VERSION "@KIWI_VERSION@")
+
+@PACKAGE_INIT@
+
+set_and_check(KIWI_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(KIWI_LIBRARY_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+
+if (NOT TARGET KiWi)
+  include(${CMAKE_CURRENT_LIST_DIR}/KiWiTargets.cmake)
+endif()
+
+set(KIWI_LIBRARY KiWi)
+set(KiWi_LIBRARY ${KIWI_LIBRARY})
+set(KiWi_LIBRARY_DIR ${KIWI_LIBRARY_DIR})
+set(KiWi_INCLUDE_DIR ${KIWI_INCLUDE_DIR})