From 5be457230223d2bf1a15275fd7367926dbce1961 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 7 Apr 2015 21:05:47 -0400 Subject: [PATCH] Decided to remove containerShow() and containerHide() for now. --- newcontrol_darwin.m | 12 ------------ newcontrol_unix.c | 12 ------------ newcontrol_windows.c | 12 ------------ stack.c | 12 ------------ uipriv.h | 2 -- 5 files changed, 50 deletions(-) diff --git a/newcontrol_darwin.m b/newcontrol_darwin.m index cb5388f3..9b9dd7bc 100644 --- a/newcontrol_darwin.m +++ b/newcontrol_darwin.m @@ -54,16 +54,6 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i [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 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.preferredSize = singlePreferredSize; c->control.resize = singleResize; - c->control.containerShow = singleContainerShow; - c->control.containerHide = singleContainerHide; c->data = data; diff --git a/newcontrol_unix.c b/newcontrol_unix.c index 87aa1057..673bb81e 100644 --- a/newcontrol_unix.c +++ b/newcontrol_unix.c @@ -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); } -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 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.preferredSize = singlePreferredSize; c->control.resize = singleResize; - c->control.containerShow = singleContainerShow; - c->control.containerHide = singleContainerHide; c->data = data; diff --git a/newcontrol_windows.c b/newcontrol_windows.c index a7288f71..1ea9947f 100644 --- a/newcontrol_windows.c +++ b/newcontrol_windows.c @@ -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()"); } -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) { uiSingleHWNDControl *c = (uiSingleHWNDControl *) dwRefData; @@ -93,8 +83,6 @@ uiControl *uiWindowsNewControl(uiWindowsNewControlParams *p) c->control.setParent = singleSetParent; c->control.preferredSize = singlePreferredSize; c->control.resize = singleResize; - c->control.containerShow = singleContainerShow; - c->control.containerHide = singleContainerHide; c->onWM_COMMAND = p->onWM_COMMAND; c->onWM_NOTIFY = p->onWM_NOTIFY; diff --git a/stack.c b/stack.c index 396e9f6f..55dc384f 100644 --- a/stack.c +++ b/stack.c @@ -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) { stack *s; @@ -177,8 +167,6 @@ uiControl *uiNewHorizontalStack(void) s->control.setParent = stackSetParent; s->control.preferredSize = stackPreferredSize; s->control.resize = stackResize; - s->control.containerShow = stackContainerShow; - s->control.containerHide = stackContainerHide; return (uiControl *) s; } diff --git a/uipriv.h b/uipriv.h index 0500f74b..e7d32375 100644 --- a/uipriv.h +++ b/uipriv.h @@ -16,8 +16,6 @@ struct uiControl { void (*setParent)(uiControl *, uintptr_t); uiSize (*preferredSize)(uiControl *, uiSizing *); void (*resize)(uiControl *, intmax_t, intmax_t, intmax_t, intmax_t, uiSizing *); - void (*containerShow)(uiControl *); - void (*containerHide)(uiControl *); }; extern void *uiAlloc(size_t);