Index: /trunk/desktop/Makefile
===================================================================
--- /trunk/desktop/Makefile	(revision 176)
+++ /trunk/desktop/Makefile	(revision 178)
@@ -39,4 +39,5 @@
 			$(OBJDIR)/wpdatafile.o \
 			$(OBJDIR)/wpfolder.o \
+			$(OBJDIR)/wpwindow.o \
 			$(OBJDIR)/wpnotebook.o \
 			$(OBJDIR)/wpclassmanager.o \
Index: /trunk/desktop/class_c/wpnotebook.c
===================================================================
--- /trunk/desktop/class_c/wpnotebook.c	(revision 176)
+++ /trunk/desktop/class_c/wpnotebook.c	(revision 178)
@@ -65,23 +65,4 @@
 
 
-NOM_Scope void NOMLINK impl_WPNoteBook_wpSetWPObject(WPNoteBook* nomSelf, const PWPObject wpObject,
-                                                     CORBA_Environment *ev)
-{
-  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
-  _wpObject=wpObject;
-
-}
-
-
-NOM_Scope PWPObject NOMLINK impl_WPNoteBook_wpQueryWPObject(WPNoteBook* nomSelf, CORBA_Environment *ev)
-{
-  WPNoteBookData* nomThis=WPNoteBookGetData(nomSelf);
-
-  return _wpObject;
-}
-
-
-
-
 NOM_Scope void NOMLINK impl_WPNoteBook_nomInit(WPNoteBook* nomSelf, CORBA_Environment *ev)
 {
Index: /trunk/desktop/class_c/wpwindow.c
===================================================================
--- /trunk/desktop/class_c/wpwindow.c	(revision 178)
+++ /trunk/desktop/class_c/wpwindow.c	(revision 178)
@@ -0,0 +1,63 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: CDDL 1.0/LGPL 2.1
+*
+* The contents of this file are subject to the COMMON DEVELOPMENT AND
+* DISTRIBUTION LICENSE (CDDL) Version 1.0 (the "License"); you may not use
+* this file except in compliance with the License. You may obtain a copy of
+* the License at http://www.sun.com/cddl/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is "NOM" Netlabs Object Model
+*
+* The Initial Developer of the Original Code is
+* netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
+* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*
+* Alternatively, the contents of this file may be used under the terms of
+* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
+* case the provisions of the LGPL are applicable instead of those above. If
+* you wish to allow use of your version of this file only under the terms of
+* the LGPL, and not to allow others to use your version of this file under
+* the terms of the CDDL, indicate your decision by deleting the provisions
+* above and replace them with the notice and other provisions required by the
+* LGPL. If you do not delete the provisions above, a recipient may use your
+* version of this file under the terms of any one of the CDDL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+/*
+ * And remember, phase 3 is near...
+ */
+#include <os2.h>
+
+#include <nom.h>
+#include <nomtk.h>
+#include <gtk/gtk.h>
+#include <nomguitk.h>
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
+#include <string.h>
+
+#include "nomfolderwindow.h"
+#include "wpwindow.ih"
+
+NOM_Scope void NOMLINK impl_WPWindow_wpSetWPObject(WPWindow* nomSelf, const PWPObject wpObject, CORBA_Environment *ev)
+{
+  WPWindowData* nomThis=WPWindowGetData(nomSelf);
+  _wpObject=wpObject;
+}
+
+NOM_Scope PWPObject NOMLINK impl_WPWindow_wpQueryWPObject(WPWindow* nomSelf, CORBA_Environment *ev)
+{
+  WPWindowData* nomThis=WPWindowGetData(nomSelf);
+
+  return _wpObject;
+}
+
Index: /trunk/desktop/exports.def
===================================================================
--- /trunk/desktop/exports.def	(revision 176)
+++ /trunk/desktop/exports.def	(revision 178)
@@ -37,3 +37,7 @@
 	WPNoteBookNewClass
 
+	_WPWindowClassData
+	_WPWindowCClassData
+	WPWindowNewClass
+
 ;IMPORTS
Index: /trunk/desktop/idl/wpnotebook.idl
===================================================================
--- /trunk/desktop/idl/wpnotebook.idl	(revision 176)
+++ /trunk/desktop/idl/wpnotebook.idl	(revision 178)
@@ -47,9 +47,10 @@
 NOMCLASSNAME(WPNoteBook);
 
-#include "wpobject.idl"
+//#include "wpobject.idl"
+#include "wpwindow.idl"
 #include "nomnotebook.idl"
 
 
-interface WPNoteBook : NOMWindow
+interface WPNoteBook : WPWindow
 {
   NOMCLASSVERSION(1, 0);
@@ -57,6 +58,6 @@
   PNOMNoteBook wpQueryNoteBookObject();
   void wpSetNoteBookObject(in PNOMNoteBook nomNBook);
-  void wpSetWPObject(in PWPObject wpObject);
-  PWPObject wpQueryWPObject();
+  //void wpSetWPObject(in PWPObject wpObject);
+  //PWPObject wpQueryWPObject();
 
   NOMOVERRIDE(nomInit);
Index: /trunk/desktop/idl/wpwindow.idl
===================================================================
--- /trunk/desktop/idl/wpwindow.idl	(revision 178)
+++ /trunk/desktop/idl/wpwindow.idl	(revision 178)
@@ -0,0 +1,65 @@
+/* ***** BEGIN LICENSE BLOCK *****
+* Version: CDDL 1.0/LGPL 2.1
+*
+* The contents of this file are subject to the COMMON DEVELOPMENT AND
+* DISTRIBUTION LICENSE (CDDL) Version 1.0 (the "License"); you may not use
+* this file except in compliance with the License. You may obtain a copy of
+* the License at http://www.sun.com/cddl/
+*
+* Software distributed under the License is distributed on an "AS IS" basis,
+* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+* for the specific language governing rights and limitations under the
+* License.
+*
+* The Original Code is "NOM" Netlabs Object Model
+*
+* The Initial Developer of the Original Code is
+* netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
+* Portions created by the Initial Developer are Copyright (C) 2005-2006
+* the Initial Developer. All Rights Reserved.
+*
+* Contributor(s):
+*
+* Alternatively, the contents of this file may be used under the terms of
+* the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
+* case the provisions of the LGPL are applicable instead of those above. If
+* you wish to allow use of your version of this file only under the terms of
+* the LGPL, and not to allow others to use your version of this file under
+* the terms of the CDDL, indicate your decision by deleting the provisions
+* above and replace them with the notice and other provisions required by the
+* LGPL. If you do not delete the provisions above, a recipient may use your
+* version of this file under the terms of any one of the CDDL or the LGPL.
+*
+* ***** END LICENSE BLOCK ***** */
+
+#ifndef WPWINDOW_IDL_INCLUDED
+#define WPWINDOW_IDL_INCLUDED
+
+#if 0
+#ifndef WPObject_defined
+#define WPObject_defined
+native PWPObject;
+#endif
+#endif
+
+#include <nomobj.idl>
+
+NOMCLASSNAME(WPWindow);
+
+#include "wpobject.idl"
+
+interface WPWindow : NOMWindow
+{
+  NOMCLASSVERSION(1, 0);
+
+  void wpSetWPObject(in PWPObject wpObject);
+  PWPObject wpQueryWPObject();
+
+  NOMINSTANCEVAR(PWPObject wpObject);
+};
+
+#endif /* WPWINDOW_IDL_INCLUDED */
+
+
+
+
Index: unk/desktop/make.inc
===================================================================
--- /trunk/desktop/make.inc	(revision 176)
+++ 	(revision )
@@ -1,37 +1,0 @@
-#
-# Includes for desktop makefiles
-#
-
-CC		=	gcc
-
-GCCFLAGSDLL	=	-Zmtd -Zdll -D__OS2__ -D__ST_MT_ERRNO__ -c -Wall 
-GCCLDFLAGSDLL	=	-Zmt  -Zdll
-
-GCCFLAGS	=	-Zmt -Zcrtdll -D__OS2__ -D__ST_MT_ERRNO__ -c -Wall
-#GCCFLAGS	=		-E -P
-
-GCCLDFLAGS	=	-Zmt -Zcrtdll -Zdll
-
-LIBS		=	-lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0
-
-
-VERSION		=	0_0_1
-VERSION_STRING  =	0.0.1
-AUTHOR_STRING	=	"(C) Chris Wohlgemuth 2003-2006"
-
-# Put version in environment for REXX skripts
-export	DESKTOPVERSION	=	$(VERSION_STRING)
-export	AUTHORSTRING	=	$(AUTHOR_STRING)
-
-
-FIXLINKAGEH	=	cmd.exe /C ".\..\tools\fix_linkage.cmd" $(CLASSINC)/$(basename $(notdir $<)).h
-FIXLINKAGEIH	=	cmd.exe /C ".\..\tools\fix_linkage.cmd" $(CLASSINC)/$(basename $(notdir $<)).ih
-# The som compiler doesn't touch the c implementation file if there're no changes to be written.
-# Interestingly H files are always newly written.
-# So to make the makefile working we have to touch the c file whenever the som compiler is run.
-TOUCHFILE	=	touch $(CLASSCDIR)/$(basename $(notdir $<)).c
-
-export	SOMINC	=	-I z:\include
-
-IDLCOMP		=	L:\svn-sources\nom\trunk\ORBit2-2.14.0\src\idl-compiler\.libs\orbit-idl-2.exe
-NOMPATH		=	L:/svn-sources/nom/trunk/nom
