#ifndef WX_PRECOMP
#include "wx/textctrl.h"
+ #include "wx/scrolwin.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/utils.h"
# include <fstream>
#endif
-#if defined(__EMX__) && !defined(MLE_INDEX)
+#if !defined(MLE_INDEX)
#define MLE_INDEX 0
#define MLE_RGB 1
#endif
, const wxString& rsName
)
{
+ HWND hParent;
+ int nTempy;
//
// Base initialization
//
return FALSE;
wxPoint vPos = rPos; // The OS/2 position
+ SWP vSwp;
if (pParent )
{
pParent->AddChild(this);
- //
- // OS2 uses normal coordinates, no bassackwards Windows ones
- //
-// vPos.y = pParent->GetSize().y - (vPos.y + rSize.y);
- }
- else
- {
- RECTL vRect;
-
- ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
-// vPos.y = vRect.yTop - (vPos.y + rSize.y);
}
m_windowStyle = lStyle;
//
if ( m_windowStyle & wxTE_MULTILINE )
{
+ lSstyle |= MLS_BORDER | MLS_WORDWRAP;
m_bIsMLE = TRUE;
- m_windowStyle |= wxTE_PROCESS_ENTER;
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
lSstyle |= MLS_VSCROLL;
}
else
{
- lSstyle |= ES_LEFT;
+ lSstyle |= ES_LEFT | ES_AUTOSCROLL | ES_MARGIN;
if (m_windowStyle & wxHSCROLL)
lSstyle |= ES_AUTOSCROLL;
if (m_windowStyle & wxTE_PASSWORD) // hidden input
lSstyle |= ES_UNREADABLE;
}
+ //
+ // 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)))
+ lSstyle |= WS_CLIPSIBLINGS;
+
if (m_bIsMLE)
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
//
// Set font, position, size and initial value
//
- wxFont& vFontParent = pParent->GetFont();
-
- if (vFontParent.Ok())
- {
- SetFont(vFontParent);
- }
- else
- {
- SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
- }
+ wxFont* pTextFont = new wxFont( 10
+ ,wxMODERN
+ ,wxNORMAL
+ ,wxNORMAL
+ );
+ SetFont(*pTextFont);
if (!rsValue.IsEmpty())
{
SetValue(rsValue);
}
SetupColours();
- SetSize( rPos.x
- ,rPos.y
+ //
+ // If X and/or Y are not zero the difference is the compensation value
+ // for margins for OS/2 controls.
+ //
+ ::WinQueryWindowPos(m_hWnd, &vSwp);
+ SetXComp(vSwp.x);
+ SetYComp(vSwp.y);
+ SetSize( vPos.x
+ ,vPos.y
,rSize.x
,rSize.y
);
{
wxColour vBkgndColour;
- vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
+ vBkgndColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
SetBackgroundColour(vBkgndColour);
SetForegroundColour(GetParent()->GetForegroundColour());
+ if (m_bIsMLE)
+ {
+ ::WinSendMsg( GetHwnd()
+ ,MLM_SETTEXTCOLOR
+ ,(MPARAM)GetParent()->GetForegroundColour().GetPixel()
+ ,(MPARAM)MLE_RGB
+ );
+ }
} // end of wxTextCtrl::SetupColours
// ----------------------------------------------------------------------------
const wxString& rsValue
)
{
- if (m_defaultStyle.HasFont() || m_defaultStyle.HasTextColour())
- {
- long lStart;
- long lEnd;
-
- GetSelection( &lStart
- ,&lEnd
- );
- SetStyle( lStart
- ,lEnd
- ,m_defaultStyle
- );
- }
- ::WinSetWindowText(GetHwnd(), rsValue.c_str());
+ ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM((PCHAR)rsValue.c_str()), MPARAM(0));
AdjustSpaceLimit();
} // end of wxTextCtrl::WriteText
::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar), (MPARAM)0);
} // end of wxTextCtrl::SetSelection
-bool wxTextCtrl::SetStyle(
- long lStart
-, long lEnd
-, const wxTextAttr& rStyle
-)
-{
- HWND hWnd = GetHwnd();
- //
- // Order the range if needed
- //
- if (lStart > lEnd)
- {
- long lTmp = lStart;
-
- lStart = lEnd;
- lEnd = lTmp;
- }
-
- //
- // We can only change the format of the selection, so select the range we
- // want and restore the old selection later
- long lStartOld;
- long lEndOld;
-
- GetSelection( &lStartOld
- ,&lEndOld
- );
-
- //
- // But do we really have to change the selection?
- //
- bool bChangeSel = lStart != lStartOld || lEnd != lEndOld;
-
- if (bChangeSel)
- {
- if (m_bIsMLE)
- ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
- else
- ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
- }
- //
- // TODO:: finish this by setting fonts and colors
- //
- return TRUE;
-} // end of wxTextCtrl::SetStyle
-
bool wxTextCtrl::LoadFile(
const wxString& rsFile
)
else
::GpiSetBackMix(hPS, BM_OVERPAINT);
if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
- vColBack = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ vColBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::GpiSetBackColor(hPS, vColBack.GetPixel());
::GpiSetColor(hPS, vColFore.GetPixel());
return (WXHBRUSH)pBackgroundBrush->GetResourceHandle();
} // end of wxTextCtrl::OnCtlColor
+bool wxTextCtrl::OS2ShouldPreProcessMessage(
+ WXMSG* pMsg
+)
+{
+ return wxControl::OS2ShouldPreProcessMessage(pMsg);
+} // end of wxTextCtrl::OS2ShouldPreProcessMessage
+
void wxTextCtrl::OnChar(
wxKeyEvent& rEvent
)
wxGetCharSize(GetHWND(), &nCx, &nCy, (wxFont*)&GetFont());
int wText = DEFAULT_ITEM_WIDTH;
- int hText = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy);
+ int hText = (EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
if (m_windowStyle & wxTE_MULTILINE)
{
- hText *= wxMin(GetNumberOfLines(), 5);
+ hText *= wxMax(GetNumberOfLines(), 5);
}
//else: for single line control everything is ok
return wxSize(wText, hText);
return TRUE;
} // end of wxTextCtrl::SetForegroundColour
+bool wxTextCtrl::SetStyle(
+ long lStart
+, long lEnd
+, const wxTextAttr& rStyle
+)
+{
+ HWND hWnd = GetHwnd();
+
+ if (lStart > lEnd)
+ {
+ long lTmp = lStart;
+
+ lStart = lEnd;
+ lEnd = lTmp;
+ }
+
+ //
+ // We can only change the format of the selection, so select the range we
+ // want and restore the old selection later
+ //
+ long lStartOld;
+ long lEndOld;
+
+ GetSelection( &lStartOld
+ ,&lEndOld
+ );
+
+ //
+ // But do we really have to change the selection?
+ //
+ bool bChangeSel = lStart != lStartOld ||
+ lEnd != lEndOld;
+
+ if (bChangeSel)
+ {
+ if (m_bIsMLE)
+ ::WinSendMsg(hWnd, MLM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
+ else
+ ::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lStart, (USHORT)lEnd), 0);
+ }
+
+ //
+ // TODO:: finish this part
+ //
+ return TRUE;
+} // end of wxTextCtrl::SetStyle
+
projects / wxWidgets.git / blobdiff