// Modified by:
// Created: 09/17/99
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/scrolwin.h"
+#include "wx/log.h"
#endif
#include "wx/os2/private.h"
#include "wx/control.h"
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
)
{
bool bWant3D = FALSE;
- int nX = rPos.x == -1 ? 0 : rPos.x;
- int nY = rPos.y == -1 ? 0 : rPos.y;
- int nW = rSize.x == -1 ? 0 : rSize.x;
- int nH = rSize.y == -1 ? 0 : rSize.y;
+
//
// Doesn't do anything at all under OS/2
//
// All controls should have these styles (wxWindows creates all controls
// visible by default)
//
- dwStyle |= WS_VISIBLE;
+ if (m_isShown )
+ dwStyle |= WS_VISIBLE;
wxWindow* pParent = GetParent();
PSZ zClass;
zClass = WC_STATIC;
else if ((strcmp(zClassname, "BUTTON")) == 0)
zClass = WC_BUTTON;
+ else if ((strcmp(zClassname, "NOTEBOOK")) == 0)
+ zClass = WC_NOTEBOOK;
+ else if ((strcmp(zClassname, "CONTAINER")) == 0)
+ zClass = WC_CONTAINER;
dwStyle |= WS_VISIBLE;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
// Controls use the same font and colours as their parent dialog by default
//
InheritAttributes();
- if (nW == 0 || nH == 0)
- SetBestSize(rSize);
+ SetXComp(0);
+ SetYComp(0);
+ SetSize( rPos.x
+ ,rPos.y
+ ,rSize.x
+ ,rSize.y
+ );
return TRUE;
} // end of wxControl::OS2CreateControl