diff --git a/common/general.h b/common/general.h deleted file mode 100644 index 3458e47f..00000000 --- a/common/general.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef H_COMMON_GENERAL -#define H_COMMON_GENERAL - -#ifdef __cplusplus -extern "C" { -#endif - -inline int max(int first, int second) -{ - return (first < second) ? second : first; -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/windows/button.cpp b/windows/button.cpp index 9affd985..8e5d7c54 100644 --- a/windows/button.cpp +++ b/windows/button.cpp @@ -1,6 +1,5 @@ // 7 april 2015 #include "uipriv_windows.hpp" -#include "../common/general.h" struct uiButton { uiWindowsControl c; @@ -33,6 +32,11 @@ static void uiButtonDestroy(uiControl *c) uiWindowsControlAllDefaultsExceptDestroy(uiButton) +static int max(int first, int second) +{ + return (first < second) ? second : first; +} + // from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing #define buttonHeight 14