// 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"
// Item members
wxControl::wxControl()
{
-
-#if WXWIN_COMPATIBILITY
- m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
} // end of wxControl::wxControl
bool wxControl::Create(
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
, WXDWORD dwExstyle
)
{
- bool bWant3D = FALSE;
-
//
// Doesn't do anything at all under OS/2
//
if (dwExstyle == (WXDWORD)-1)
{
- dwExstyle = Determine3DEffects(WS_EX_CLIENTEDGE, &bWant3D);
+ dwExstyle = 0;
+ (void) OS2GetStyle(GetWindowStyle(), &dwExstyle);
}
//
// 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_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
SubclassWin(m_hWnd);
//
- // Controls use the same font and colours as their parent dialog by default
+ // Controls use the same colours as their parent dialog by default
//
InheritAttributes();
+ //
+ // All OS/2 ctrls use the small font
+ //
+ SetFont(*wxSMALL_FONT);
+
SetXComp(0);
SetYComp(0);
SetSize( rPos.x
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
-#if WXWIN_COMPATIBILITY
- if ( m_callback )
- {
- (void)(*m_callback)(this, event);
-
- return TRUE;
- }
- else
-#endif // WXWIN_COMPATIBILITY
-
return GetEventHandler()->ProcessEvent(event);
}
return dwStyle;
} // end of wxControl::OS2GetStyle
+void wxControl::SetLabel(
+ const wxString& rsLabel
+)
+{
+ wxString sLabel = ::wxPMTextToLabel(rsLabel);
+
+ ::WinSetWindowText(GetHwnd(), sLabel.c_str());
+} // end of wxControl::SetLabel
+
// ---------------------------------------------------------------------------
// global functions
// ---------------------------------------------------------------------------