// 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/event.h"
#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
)
{
}
bool wxControl::OS2CreateControl(
- wxWindow* pParent
-, wxWindowID vId
+ const wxChar* zClassname
+, const wxString& rsLabel
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
-, const wxValidator& rValidator
-#endif
-, const wxString& rsName
)
{
- //
- // Even if it's possible to create controls without parents in some port,
- // it should surely be discouraged because it doesn't work at all under
- // Windows
- //
- if (!CreateBase( pParent
- ,vId
- ,rPos
- ,rSize
- ,lStyle
-#if wxUSE_VALIDATORS
- ,rValidator
-#endif
- ,rsName
- ))
- return FALSE;
- pParent->AddChild(this);
- return TRUE;
+ WXDWORD dwExstyle;
+ WXDWORD dwStyle = OS2GetStyle( lStyle
+ ,&dwExstyle
+ );
+
+ return OS2CreateControl( zClassname
+ ,dwStyle
+ ,rPos
+ ,rSize
+ ,rsLabel
+ ,dwExstyle
+ );
} // end of wxControl::OS2CreateControl
bool wxControl::OS2CreateControl(
, 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
//
if (dwExstyle == (WXDWORD)-1)
{
- dwExstyle = GetExStyle(dwStyle);
+ dwExstyle = 0;
+ (void) OS2GetStyle(GetWindowStyle(), &dwExstyle);
}
+ //
+ // All controls should have these styles (wxWidgets creates all controls
+ // visible by default)
+ //
+ if (m_isShown )
+ dwStyle |= WS_VISIBLE;
wxWindow* pParent = GetParent();
- PSZ zClass;
+ PSZ zClass = "";
if (!pParent)
return FALSE;
- if ((strcmp(zClassname, "COMBOBOX")) == 0)
+ if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0)
zClass = WC_COMBOBOX;
- else if ((strcmp(zClassname, "STATIC")) == 0)
+ else if ((wxStrcmp(zClassname, _T("STATIC"))) == 0)
zClass = WC_STATIC;
+ else if ((wxStrcmp(zClassname, _T("BUTTON"))) == 0)
+ zClass = WC_BUTTON;
+ else if ((wxStrcmp(zClassname, _T("NOTEBOOK"))) == 0)
+ zClass = WC_NOTEBOOK;
+ else if ((wxStrcmp(zClassname, _T("CONTAINER"))) == 0)
+ zClass = WC_CONTAINER;
dwStyle |= WS_VISIBLE;
- //
- // If the parent is a scrolled window the controls must
- // have this style or they will overlap the scrollbars
- //
- if (pParent)
- if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)) ||
- pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)))
- dwStyle |= WS_CLIPSIBLINGS;
+ wxString sLabel = ::wxPMTextToLabel(rsLabel);
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,(PSZ)zClass // Window class
- ,(PSZ)rsLabel.c_str() // Initial Text
+ ,(PSZ)sLabel.c_str() // Initial Text
,(ULONG)dwStyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
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();
- if (nW == 0 || nH == 0)
- SetBestSize(rSize);
+ //
+ // All OS/2 ctrls use the small font
+ //
+ SetFont(*wxSMALL_FONT);
+
+ SetXComp(0);
+ SetYComp(0);
+ SetSize( rPos.x
+ ,rPos.y
+ ,rSize.x
+ ,rSize.y
+ );
return TRUE;
} // end of wxControl::OS2CreateControl
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);
}
::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
} // end of wxControl::OnEraseBackground
-WXDWORD wxControl::GetExStyle(
- WXDWORD& rStyle
+WXDWORD wxControl::OS2GetStyle(
+ long lStyle
+, WXDWORD* pdwExstyle
) const
{
- //
- // Meaningless under OS/2, just return what was sent
- //
- WXDWORD exStyle = rStyle;
+ long dwStyle = wxWindow::OS2GetStyle( lStyle
+ ,pdwExstyle
+ );
+
+ if (AcceptsFocus())
+ {
+ dwStyle |= WS_TABSTOP;
+ }
+ return dwStyle;
+} // end of wxControl::OS2GetStyle
+
+void wxControl::SetLabel(
+ const wxString& rsLabel
+)
+{
+ wxString sLabel = ::wxPMTextToLabel(rsLabel);
- return exStyle;
-} // end of wxControl::GetExStyle
+ ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
+} // end of wxControl::SetLabel
// ---------------------------------------------------------------------------
// global functions
if (nRight > pRect->xRight)
pRect->xRight = nRight;
- if (nTop < pRect->yTop)
+ if (nTop > pRect->yTop)
pRect->yTop = nTop;
- if (nBottom > pRect->yBottom)
+ if (nBottom < pRect->yBottom)
pRect->yBottom = nBottom;
} // end of wxFindMaxSize
projects / wxWidgets.git / blobdiff