tmp: inline win

This commit is contained in:
Rustam Gamidov 2020-03-24 22:10:01 +02:00
parent 760e113414
commit a6d95ad2cc
2 changed files with 5 additions and 18 deletions

View File

@ -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

View File

@ -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