#include "wx/event.h"
#include "wx/app.h"
#include "wx/dcclient.h"
+#include "wx/scrolwin.h"
#endif
#include "wx/os2/private.h"
#include "wx/control.h"
, WXDWORD dwExstyle
)
{
+ 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
//
dwExstyle = GetExStyle(dwStyle);
}
- if ( !m_hWnd )
- {
-#ifdef __WXDEBUG__
- wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
-#endif // DEBUG
+ wxWindow* pParent = GetParent();
+ PSZ zClass;
+ if (!pParent)
return FALSE;
- }
-
- PSZ zClass;
if ((strcmp(zClassname, "COMBOBOX")) == 0)
zClass = WC_COMBOBOX;
else if ((strcmp(zClassname, "STATIC")) == 0)
zClass = WC_STATIC;
+ else if ((strcmp(zClassname, "BUTTON")) == 0)
+ zClass = WC_BUTTON;
dwStyle |= WS_VISIBLE;
- m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(GetParent()) // Parent window handle
- ,(PSZ)zClassname // Window class
- ,(PSZ)rsLabel.c_str() // Initial Text
- ,(ULONG)dwStyle // Style flags
- ,(LONG)rPos.x // X pos of origin
- ,(LONG)rPos.y // Y pos of origin
- ,(LONG)rSize.x // control width
- ,(LONG)rSize.y // control height
- ,(HWND)GetHwndOf(GetParent()) // owner window handle (same as parent
- ,HWND_TOP // initial z position
- ,(ULONG)GetId() // Window identifier
- ,NULL // no control data
- ,NULL // no Presentation parameters
+
+ m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
+ ,(PSZ)zClass // Window class
+ ,(PSZ)rsLabel.c_str() // Initial Text
+ ,(ULONG)dwStyle // Style flags
+ ,(LONG)0 // X pos of origin
+ ,(LONG)0 // Y pos of origin
+ ,(LONG)0 // control width
+ ,(LONG)0 // control height
+ ,(HWND)GetHwndOf(pParent) // owner window handle (same as parent
+ ,HWND_TOP // initial z position
+ ,(ULONG)GetId() // Window identifier
+ ,NULL // no control data
+ ,NULL // no Presentation parameters
);
+ if ( !m_hWnd )
+ {
+#ifdef __WXDEBUG__
+ wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
+#endif // DEBUG
+
+ return FALSE;
+ }
//
// Subclass again for purposes of dialog editing mode
//
// Controls use the same font and colours as their parent dialog by default
//
InheritAttributes();
+ if (nW == 0 || nH == 0)
+ SetBestSize(rSize);
return TRUE;
} // end of wxControl::OS2CreateControl