interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make control visible and enabled const correct.

This commit is contained in:
BQ 2016-05-31 13:28:39 +01:00
parent 8247bc2b2b
commit cd030aba96
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/control.c
View File

@ -27,7 +27,7 @@ int uiControlToplevel(uiControl *c)
return (*(c->Toplevel))(c); return (*(c->Toplevel))(c);
} }
int uiControlVisible(uiControl *c) int uiControlVisible(const uiControl *c)
{ {
return (*(c->Visible))(c); return (*(c->Visible))(c);
} }
@ -42,7 +42,7 @@ void uiControlHide(uiControl *c)
(*(c->Hide))(c); (*(c->Hide))(c);
} }
int uiControlEnabled(uiControl *c) int uiControlEnabled(const uiControl *c)
{ {
return (*(c->Enabled))(c); return (*(c->Enabled))(c);
} }

2
darwin/window.m
View File

@ -114,7 +114,7 @@ static int uiWindowToplevel(uiControl *c)
return 1; return 1;
} }
static int uiWindowVisible(uiControl *c) static int uiWindowVisible(const uiControl *c)
{ {
uiWindow *w = uiWindow(c); uiWindow *w = uiWindow(c);

10
ui.h
View File

@ -56,10 +56,10 @@ struct uiControl {
uiControl *(*Parent)(uiControl *); uiControl *(*Parent)(uiControl *);
void (*SetParent)(uiControl *, uiControl *); void (*SetParent)(uiControl *, uiControl *);
int (*Toplevel)(uiControl *); int (*Toplevel)(uiControl *);
int (*Visible)(uiControl *); int (*Visible)(const uiControl *);
void (*Show)(uiControl *); void (*Show)(uiControl *);
void (*Hide)(uiControl *); void (*Hide)(uiControl *);
int (*Enabled)(uiControl *); int (*Enabled)(const uiControl *);
void (*Enable)(uiControl *); void (*Enable)(uiControl *);
void (*Disable)(uiControl *); void (*Disable)(uiControl *);
}; };
@ -70,10 +70,10 @@ _UI_EXTERN uintptr_t uiControlHandle(uiControl *);
_UI_EXTERN uiControl *uiControlParent(uiControl *); _UI_EXTERN uiControl *uiControlParent(uiControl *);
_UI_EXTERN void uiControlSetParent(uiControl *, uiControl *); _UI_EXTERN void uiControlSetParent(uiControl *, uiControl *);
_UI_EXTERN int uiControlToplevel(uiControl *); _UI_EXTERN int uiControlToplevel(uiControl *);
_UI_EXTERN int uiControlVisible(uiControl *); _UI_EXTERN int uiControlVisible(const uiControl *);
_UI_EXTERN void uiControlShow(uiControl *); _UI_EXTERN void uiControlShow(uiControl *);
_UI_EXTERN void uiControlHide(uiControl *); _UI_EXTERN void uiControlHide(uiControl *);
_UI_EXTERN int uiControlEnabled(uiControl *); _UI_EXTERN int uiControlEnabled(const uiControl *);
_UI_EXTERN void uiControlEnable(uiControl *); _UI_EXTERN void uiControlEnable(uiControl *);
_UI_EXTERN void uiControlDisable(uiControl *); _UI_EXTERN void uiControlDisable(uiControl *);
@ -150,7 +150,7 @@ typedef struct uiGroup uiGroup;
#define uiGroup(this) ((uiGroup *) (this)) #define uiGroup(this) ((uiGroup *) (this))
_UI_EXTERN char *uiGroupTitle(uiGroup *g); _UI_EXTERN char *uiGroupTitle(uiGroup *g);
_UI_EXTERN void uiGroupSetTitle(uiGroup *g, const char *title); _UI_EXTERN void uiGroupSetTitle(uiGroup *g, const char *title);
_UI_EXTERN void uiGroupSetChild(uiGroup *g, uiControl *c); _UI_EXTERN void uiGroSetChildup(uiGroup *g, uiControl *c);
_UI_EXTERN int uiGroupMargined(uiGroup *g); _UI_EXTERN int uiGroupMargined(uiGroup *g);
_UI_EXTERN void uiGroupSetMargined(uiGroup *g, int margined); _UI_EXTERN void uiGroupSetMargined(uiGroup *g, int margined);
_UI_EXTERN uiGroup *uiNewGroup(const char *title); _UI_EXTERN uiGroup *uiNewGroup(const char *title);

4
ui_darwin.h
View File

@ -63,7 +63,7 @@ _UI_EXTERN void uiDarwinControlSetHuggingPriority(uiDarwinControl *, NSLayoutPri
return 0; \ return 0; \
} }
#define uiDarwinControlDefaultVisible(type, handlefield) \ #define uiDarwinControlDefaultVisible(type, handlefield) \
static int type ## Visible(uiControl *c) \ static int type ## Visible(const uiControl *c) \
{ \ { \
return uiDarwinControl(c)->visible; \ return uiDarwinControl(c)->visible; \
} }
@ -80,7 +80,7 @@ _UI_EXTERN void uiDarwinControlSetHuggingPriority(uiDarwinControl *, NSLayoutPri
[type(c)->handlefield setHidden:YES]; \ [type(c)->handlefield setHidden:YES]; \
} }
#define uiDarwinControlDefaultEnabled(type, handlefield) \ #define uiDarwinControlDefaultEnabled(type, handlefield) \
static int type ## Enabled(uiControl *c) \ static int type ## Enabled(const uiControl *c) \
{ \ { \
return uiDarwinControl(c)->enabled; \ return uiDarwinControl(c)->enabled; \
} }

4
ui_unix.h
View File

@ -51,7 +51,7 @@ _UI_EXTERN void uiUnixControlSetContainer(uiUnixControl *, GtkContainer *, gbool
return 0; \ return 0; \
} }
#define uiUnixControlDefaultVisible(type) \ #define uiUnixControlDefaultVisible(type) \
static int type ## Visible(uiControl *c) \ static int type ## Visible(const uiControl *c) \
{ \ { \
return gtk_widget_get_visible(type(c)->widget); \ return gtk_widget_get_visible(type(c)->widget); \
} }
@ -66,7 +66,7 @@ _UI_EXTERN void uiUnixControlSetContainer(uiUnixControl *, GtkContainer *, gbool
gtk_widget_hide(type(c)->widget); \ gtk_widget_hide(type(c)->widget); \
} }
#define uiUnixControlDefaultEnabled(type) \ #define uiUnixControlDefaultEnabled(type) \
static int type ## Enabled(uiControl *c) \ static int type ## Enabled(const uiControl *c) \
{ \ { \
return gtk_widget_get_sensitive(type(c)->widget); \ return gtk_widget_get_sensitive(type(c)->widget); \
} }

4
ui_windows.h
View File

@ -66,7 +66,7 @@ _UI_EXTERN void uiWindowsControlAssignControlIDZOrder(uiWindowsControl *, LONG_P
return 0; \ return 0; \
} }
#define uiWindowsControlDefaultVisible(type) \ #define uiWindowsControlDefaultVisible(type) \
static int type ## Visible(uiControl *c) \ static int type ## Visible(const uiControl *c) \
{ \ { \
return uiWindowsControl(c)->visible; \ return uiWindowsControl(c)->visible; \
} }
@ -83,7 +83,7 @@ _UI_EXTERN void uiWindowsControlAssignControlIDZOrder(uiWindowsControl *, LONG_P
ShowWindow(type(c)->hwnd, SW_HIDE); \ ShowWindow(type(c)->hwnd, SW_HIDE); \
} }
#define uiWindowsControlDefaultEnabled(type) \ #define uiWindowsControlDefaultEnabled(type) \
static int type ## Enabled(uiControl *c) \ static int type ## Enabled(const uiControl *c) \
{ \ { \
return uiWindowsControl(c)->enabled; \ return uiWindowsControl(c)->enabled; \
} }

2
windows/window.cpp
View File

@ -178,7 +178,7 @@ static int uiWindowToplevel(uiControl *c)
} }
// TODO initial state of windows is hidden; ensure this here and make it so on other platforms // TODO initial state of windows is hidden; ensure this here and make it so on other platforms
static int uiWindowVisible(uiControl *c) static int uiWindowVisible(const uiControl *c)
{ {
uiWindow *w = uiWindow(c); uiWindow *w = uiWindow(c);