projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxApp::GetComCtl32Version seems possible and works now with DMC.
[wxWidgets.git]
/
src
/
os2
/
control.cpp
diff --git
a/src/os2/control.cpp
b/src/os2/control.cpp
index 6b4a38bc8bee0e9a85d788f6fc72c31b0c0625ec..df264fae88b6165880066ef0dcb168eea57b2d62 100644
(file)
--- a/
src/os2/control.cpp
+++ b/
src/os2/control.cpp
@@
-5,7
+5,7
@@
// Modified by:
// Created: 09/17/99
// RCS-ID: $Id$
// Modified by:
// Created: 09/17/99
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-21,6
+21,7
@@
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/scrolwin.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"
#endif
#include "wx/os2/private.h"
#include "wx/control.h"
@@
-34,10
+35,6
@@
END_EVENT_TABLE()
// Item members
wxControl::wxControl()
{
// Item members
wxControl::wxControl()
{
-
-#if WXWIN_COMPATIBILITY
- m_callback = 0;
-#endif // WXWIN_COMPATIBILITY
} // end of wxControl::wxControl
bool wxControl::Create(
} // end of wxControl::wxControl
bool wxControl::Create(
@@
-46,9
+43,7
@@
bool wxControl::Create(
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
, const wxString& rsName
)
{
@@
-104,20
+99,20
@@
bool wxControl::OS2CreateControl(
, WXDWORD dwExstyle
)
{
, WXDWORD dwExstyle
)
{
- bool bWant3D = FALSE;
-
//
// Doesn't do anything at all under OS/2
//
if (dwExstyle == (WXDWORD)-1)
{
//
// 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 (wxWi
ndow
s creates all controls
+ // All controls should have these styles (wxWi
dget
s creates all controls
// visible by default)
//
// visible by default)
//
- dwStyle |= WS_VISIBLE;
+ if (m_isShown )
+ dwStyle |= WS_VISIBLE;
wxWindow* pParent = GetParent();
PSZ zClass;
wxWindow* pParent = GetParent();
PSZ zClass;
@@
-133,6
+128,8
@@
bool wxControl::OS2CreateControl(
zClass = WC_BUTTON;
else if ((strcmp(zClassname, "NOTEBOOK")) == 0)
zClass = WC_NOTEBOOK;
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
dwStyle |= WS_VISIBLE;
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
@@
-164,9
+161,14
@@
bool wxControl::OS2CreateControl(
SubclassWin(m_hWnd);
//
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();
//
InheritAttributes();
+ //
+ // All OS/2 ctrls use the small font
+ //
+ SetFont(*wxSMALL_FONT);
+
SetXComp(0);
SetYComp(0);
SetSize( rPos.x
SetXComp(0);
SetYComp(0);
SetSize( rPos.x
@@
-184,16
+186,6
@@
wxSize wxControl::DoGetBestSize() const
bool wxControl::ProcessCommand(wxCommandEvent& event)
{
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 GetEventHandler()->ProcessEvent(event);
}
@@
-253,6
+245,15
@@
WXDWORD wxControl::OS2GetStyle(
return dwStyle;
} // end of wxControl::OS2GetStyle
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
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// global functions
// ---------------------------------------------------------------------------
@@
-283,10
+284,10
@@
void wxFindMaxSize(
if (nRight > pRect->xRight)
pRect->xRight = nRight;
if (nRight > pRect->xRight)
pRect->xRight = nRight;
- if (nTop
<
pRect->yTop)
+ if (nTop
>
pRect->yTop)
pRect->yTop = nTop;
pRect->yTop = nTop;
- if (nBottom
>
pRect->yBottom)
+ if (nBottom
<
pRect->yBottom)
pRect->yBottom = nBottom;
} // end of wxFindMaxSize
pRect->yBottom = nBottom;
} // end of wxFindMaxSize