From 16cb871e9d6b0e2c18643b133c7541f9e113b03f Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@webkeks.org>
Date: Sun, 8 Jan 2012 15:03:23 +0100
Subject: [PATCH] Move -[show] and -[hide] from OGWidget to OGWindow.

---
 gtk/OGWidget.m     | 10 ----------
 gtk/OGWindow.m     | 10 ++++++++++
 headers/OGWidget.h |  3 ---
 headers/OGWindow.h |  2 ++
 win32/OGWidget.m   | 12 ------------
 win32/OGWindow.m   | 12 ++++++++++++
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/gtk/OGWidget.m b/gtk/OGWidget.m
index 1911665..b28f350 100644
--- a/gtk/OGWidget.m
+++ b/gtk/OGWidget.m
@@ -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
diff --git a/gtk/OGWindow.m b/gtk/OGWindow.m
index e13f064..2ecd9e3 100644
--- a/gtk/OGWindow.m
+++ b/gtk/OGWindow.m
@@ -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];
diff --git a/headers/OGWidget.h b/headers/OGWidget.h
index d11607f..177f930 100644
--- a/headers/OGWidget.h
+++ b/headers/OGWidget.h
@@ -38,9 +38,6 @@
 	HWND widget;
 #endif
 }
-
-- (void)show;
-- (void)hide;
 @end
 
 #if defined(OG_GTK)
diff --git a/headers/OGWindow.h b/headers/OGWindow.h
index 40f51cb..1d55205 100644
--- a/headers/OGWindow.h
+++ b/headers/OGWindow.h
@@ -41,4 +41,6 @@
 
 + window;
 - (void)addChild: (OGWidget*)widget;
+- (void)show;
+- (void)hide;
 @end
diff --git a/win32/OGWidget.m b/win32/OGWidget.m
index 7565e54..81f421a 100644
--- a/win32/OGWidget.m
+++ b/win32/OGWidget.m
@@ -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);
diff --git a/win32/OGWindow.m b/win32/OGWindow.m
index a9e7813..3344dd5 100644
--- a/win32/OGWindow.m
+++ b/win32/OGWindow.m
@@ -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];