interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Decided to remove containerShow() and containerHide() for now.

This commit is contained in:
Pietro Gagliardi 2015-04-07 21:05:47 -04:00
parent 1bb187d55b
commit c4fa92e18f
5 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
new/newcontrol_darwin.m
View File

@ -54,16 +54,6 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i
[S(c)->immediate setFrame:frame]; [S(c)->immediate setFrame:frame];
} }
static void singleContainerShow(uiControl *c)
{
[S(c)->immediate setHidden:NO];
}
static void singleContainerHide(uiControl *c)
{
[S(c)->immediate setHidden:YES];
}
// TODO connect free function // TODO connect free function
uiControl *uiDarwinNewControl(Class class, BOOL inScrollView, BOOL scrollViewHasBorder, void *data) uiControl *uiDarwinNewControl(Class class, BOOL inScrollView, BOOL scrollViewHasBorder, void *data)
@ -93,8 +83,6 @@ uiControl *uiDarwinNewControl(Class class, BOOL inScrollView, BOOL scrollViewHas
c->control.setParent = singleSetParent; c->control.setParent = singleSetParent;
c->control.preferredSize = singlePreferredSize; c->control.preferredSize = singlePreferredSize;
c->control.resize = singleResize; c->control.resize = singleResize;
c->control.containerShow = singleContainerShow;
c->control.containerHide = singleContainerHide;
c->data = data; c->data = data;

12
new/newcontrol_unix.c
View File

@ -48,16 +48,6 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i
gtk_widget_size_allocate(S(c)->immediate, &a); gtk_widget_size_allocate(S(c)->immediate, &a);
} }
static void singleContainerShow(uiControl *c)
{
gtk_widget_show_all(S(c)->immediate);
}
static void singleContainerHide(uiControl *c)
{
gtk_widget_hide(S(c)->immediate);
}
// TODO connect free function // TODO connect free function
uiControl *uiUnixNewControl(GType type, gboolean inScrolledWindow, gboolean needsViewport, gboolean scrolledWindowHasBorder, void *data, const char *firstProperty, ...) uiControl *uiUnixNewControl(GType type, gboolean inScrolledWindow, gboolean needsViewport, gboolean scrolledWindowHasBorder, void *data, const char *firstProperty, ...)
@ -89,8 +79,6 @@ uiControl *uiUnixNewControl(GType type, gboolean inScrolledWindow, gboolean need
c->control.setParent = singleSetParent; c->control.setParent = singleSetParent;
c->control.preferredSize = singlePreferredSize; c->control.preferredSize = singlePreferredSize;
c->control.resize = singleResize; c->control.resize = singleResize;
c->control.containerShow = singleContainerShow;
c->control.containerHide = singleContainerHide;
c->data = data; c->data = data;

12
new/newcontrol_windows.c
View File

@ -42,16 +42,6 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i
logLastError("error moving control in singleResize()"); logLastError("error moving control in singleResize()");
} }
static void singleContainerShow(uiControl *c)
{
ShowWindow(S(c)->hwnd, SW_SHOW);
}
static void singleContainerHide(uiControl *c)
{
ShowWindow(S(c)->hwnd, SW_HIDE);
}
static LRESULT CALLBACK singleSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) static LRESULT CALLBACK singleSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
{ {
uiSingleHWNDControl *c = (uiSingleHWNDControl *) dwRefData; uiSingleHWNDControl *c = (uiSingleHWNDControl *) dwRefData;
@ -93,8 +83,6 @@ uiControl *uiWindowsNewControl(uiWindowsNewControlParams *p)
c->control.setParent = singleSetParent; c->control.setParent = singleSetParent;
c->control.preferredSize = singlePreferredSize; c->control.preferredSize = singlePreferredSize;
c->control.resize = singleResize; c->control.resize = singleResize;
c->control.containerShow = singleContainerShow;
c->control.containerHide = singleContainerHide;
c->onWM_COMMAND = p->onWM_COMMAND; c->onWM_COMMAND = p->onWM_COMMAND;
c->onWM_NOTIFY = p->onWM_NOTIFY; c->onWM_NOTIFY = p->onWM_NOTIFY;

12
new/stack.c
View File

@ -157,16 +157,6 @@ static void stackResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, in
} }
} }
static void stackContainerShow(uiControl *c)
{
// TODO
}
static void stackContainerHide(uiControl *c)
{
// TODO
}
uiControl *uiNewHorizontalStack(void) uiControl *uiNewHorizontalStack(void)
{ {
stack *s; stack *s;
@ -177,8 +167,6 @@ uiControl *uiNewHorizontalStack(void)
s->control.setParent = stackSetParent; s->control.setParent = stackSetParent;
s->control.preferredSize = stackPreferredSize; s->control.preferredSize = stackPreferredSize;
s->control.resize = stackResize; s->control.resize = stackResize;
s->control.containerShow = stackContainerShow;
s->control.containerHide = stackContainerHide;
return (uiControl *) s; return (uiControl *) s;
} }

2
new/uipriv.h
View File

@ -16,8 +16,6 @@ struct uiControl {
void (*setParent)(uiControl *, uintptr_t); void (*setParent)(uiControl *, uintptr_t);
uiSize (*preferredSize)(uiControl *, uiSizing *); uiSize (*preferredSize)(uiControl *, uiSizing *);
void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *);
void (*containerShow)(uiControl *);
void (*containerHide)(uiControl *);
}; };
extern void *uiAlloc(size_t); extern void *uiAlloc(size_t);