Move -[show] and -[hide] from OGWidget to OGWindow.
This commit is contained in:
parent
aabc851a05
commit
16cb871e9d
6 changed files with 24 additions and 25 deletions
|
@ -44,14 +44,4 @@ void og_destroy(GtkWidget *widget, OGWidget *object)
|
|||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)show
|
||||
{
|
||||
gtk_widget_show_all(widget);
|
||||
}
|
||||
|
||||
- (void)hide
|
||||
{
|
||||
gtk_widget_hide(widget);
|
||||
}
|
||||
@end
|
||||
|
|
|
@ -100,6 +100,16 @@ willClose(GtkWidget *widget, GdkEvent *event, gpointer data)
|
|||
gtk_container_add(GTK_CONTAINER(widget), child->widget);
|
||||
}
|
||||
|
||||
- (void)show
|
||||
{
|
||||
gtk_widget_show_all(widget);
|
||||
}
|
||||
|
||||
- (void)hide
|
||||
{
|
||||
gtk_widget_hide(widget);
|
||||
}
|
||||
|
||||
- (BOOL)OG_willClose
|
||||
{
|
||||
OFAutoreleasePool *pool = [OFAutoreleasePool new];
|
||||
|
|
|
@ -38,9 +38,6 @@
|
|||
HWND widget;
|
||||
#endif
|
||||
}
|
||||
|
||||
- (void)show;
|
||||
- (void)hide;
|
||||
@end
|
||||
|
||||
#if defined(OG_GTK)
|
||||
|
|
|
@ -41,4 +41,6 @@
|
|||
|
||||
+ window;
|
||||
- (void)addChild: (OGWidget*)widget;
|
||||
- (void)show;
|
||||
- (void)hide;
|
||||
@end
|
||||
|
|
|
@ -58,18 +58,6 @@ void og_destroy(HWND widget, OGWidget *object)
|
|||
return self;
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (void)show
|
||||
{
|
||||
if(widget != NULL)
|
||||
ShowWindow(widget, SW_SHOWNORMAL);
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (void)hide
|
||||
{
|
||||
if(widget != NULL)
|
||||
ShowWindow(widget, SW_HIDE);
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (int)MessageReceived : (HWND)hwnd : (UINT)msg : (WPARAM)wparam : (LPARAM)lparam
|
||||
{
|
||||
return DefWindowProc(hwnd, msg, wparam, lparam);
|
||||
|
|
|
@ -124,6 +124,18 @@ static int CALLBACK Resize_EnumChildren(HWND child, LPARAM lparam)
|
|||
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (void)show
|
||||
{
|
||||
if(widget != NULL)
|
||||
ShowWindow(widget, SW_SHOWNORMAL);
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (void)hide
|
||||
{
|
||||
if(widget != NULL)
|
||||
ShowWindow(widget, SW_HIDE);
|
||||
}
|
||||
//----------------------------------------------------------------------------------------------------------------------------------
|
||||
- (BOOL)OG_willClose
|
||||
{
|
||||
OFAutoreleasePool *pool = [OFAutoreleasePool new];
|
||||
|
|
Reference in a new issue