ObjFW/ObjGUI.old
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move -[show] and -[hide] from OGWidget to OGWindow.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-01-08 15:03:23 +01:00
parent aabc851a05
commit 16cb871e9d
6 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk/OGWidget.m
View file

@ -44,14 +44,4 @@ void og_destroy(GtkWidget *widget, OGWidget *object)
return self; return self;
} }
- (void)show
{
gtk_widget_show_all(widget);
}
- (void)hide
{
gtk_widget_hide(widget);
}
@end @end

10
gtk/OGWindow.m
View file

@ -100,6 +100,16 @@ willClose(GtkWidget *widget, GdkEvent *event, gpointer data)
gtk_container_add(GTK_CONTAINER(widget), child->widget); gtk_container_add(GTK_CONTAINER(widget), child->widget);
} }
- (void)show
{
gtk_widget_show_all(widget);
}
- (void)hide
{
gtk_widget_hide(widget);
}
- (BOOL)OG_willClose - (BOOL)OG_willClose
{ {
OFAutoreleasePool *pool = [OFAutoreleasePool new]; OFAutoreleasePool *pool = [OFAutoreleasePool new];

3
headers/OGWidget.h
View file

@ -38,9 +38,6 @@
HWND widget; HWND widget;
#endif #endif
} }
- (void)show;
- (void)hide;
@end @end
#if defined(OG_GTK) #if defined(OG_GTK)

2
headers/OGWindow.h
View file

@ -41,4 +41,6 @@
+ window; + window;
- (void)addChild: (OGWidget*)widget; - (void)addChild: (OGWidget*)widget;
- (void)show;
- (void)hide;
@end @end

12
win32/OGWidget.m
View file

@ -58,18 +58,6 @@ void og_destroy(HWND widget, OGWidget *object)
return self; 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 - (int)MessageReceived : (HWND)hwnd : (UINT)msg : (WPARAM)wparam : (LPARAM)lparam
{ {
return DefWindowProc(hwnd, msg, wparam, lparam); return DefWindowProc(hwnd, msg, wparam, lparam);

12
win32/OGWindow.m
View file

@ -124,6 +124,18 @@ static int CALLBACK Resize_EnumChildren(HWND child, LPARAM lparam)
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER); 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 - (BOOL)OG_willClose
{ {
OFAutoreleasePool *pool = [OFAutoreleasePool new]; OFAutoreleasePool *pool = [OFAutoreleasePool new];