summaryrefslogtreecommitdiff
path: root/vcl/aqua/source/app/salinst.cxx
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2000-11-19 01:37:03 +0000
committerPatrick Luby <pluby@openoffice.org>2000-11-19 01:37:03 +0000
commit911023c6e71cf9af6935e344ceb30d97688aa0bd (patch)
tree92e433453aef5107d34a3fb3d79acfe6faeb50ef /vcl/aqua/source/app/salinst.cxx
parent2ac5bf9c5a4ba2caa7eed6cc8830571427a4685b (diff)
Enabled stub implementation of floating windows, dialog windows, and fonts so that the svdem "Debug Options" window will appear on the screen.
Diffstat (limited to 'vcl/aqua/source/app/salinst.cxx')
-rw-r--r--vcl/aqua/source/app/salinst.cxx23
1 files changed, 13 insertions, 10 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 88b8d8a349bf..ef8cdc1d5e2c 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: salinst.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: pluby $ $Date: 2000-11-17 07:34:48 $
+ * last change: $Author: pluby $ $Date: 2000-11-19 02:37:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -202,15 +202,13 @@ SalFrame* SalInstance::CreateChildFrame( SystemParentData* pSystemParentData, UL
SalFrame* SalInstance::CreateFrame( SalFrame* pParent, ULONG nSalFrameStyle )
{
- // Stub code: Mac OS X does not support child windows so retrun NULL until
- // we figure how to implement a good substitute for a child window
- if ( pParent )
- return NULL;
-
SalFrame *pFrame = new SalFrame;
- pFrame->maFrameData.mhWnd = VCLWindow_new( nSalFrameStyle, NULL, pFrame,
- &(pFrame->maFrameData) );
+ pFrame->maFrameData.mpParent = pParent;
+
+ // Create the native window
+ pFrame->maFrameData.mhWnd = VCLWindow_new( nSalFrameStyle, NULL,
+ pFrame, &(pFrame->maFrameData) );
return pFrame;
}
@@ -226,13 +224,18 @@ void SalInstance::DestroyFrame( SalFrame* pFrame )
SalObject* SalInstance::CreateObject( SalFrame* pParent )
{
- return NULL;
+ SalObject *pObject = new SalObject;
+
+ pObject->maObjectData.mhWnd = pParent->maFrameData.mhWnd;
+
+ return pObject;
}
// -----------------------------------------------------------------------
void SalInstance::DestroyObject( SalObject* pObject )
{
+ delete ( pObject );
}
void SalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )