tmp: inline win
This commit is contained in:
parent
760e113414
commit
a6d95ad2cc
|
@ -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
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue