projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac cleanup, pure cgcolor
[wxWidgets.git]
/
src
/
os2
/
textctrl.cpp
diff --git
a/src/os2/textctrl.cpp
b/src/os2/textctrl.cpp
index 0f801323ef68f160055151ee297fa7865de26428..1c7014d733d23ba0c6b57be535ba6966ee61b6a6 100644
(file)
--- a/
src/os2/textctrl.cpp
+++ b/
src/os2/textctrl.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name:
src/os2/
textctrl.cpp
// Purpose: wxTextCtrl
// Author: David Webster
// Modified by:
// Purpose: wxTextCtrl
// Author: David Webster
// Modified by:
@@
-16,17
+16,18
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/textctrl.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/textctrl.h"
#include "wx/scrolwin.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/scrolwin.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/utils.h"
#include "wx/log.h"
+ #include "wx/app.h"
#endif
#if wxUSE_CLIPBOARD
#endif
#if wxUSE_CLIPBOARD
- #include "wx/app.h"
#include "wx/clipbrd.h"
#endif
#include "wx/clipbrd.h"
#endif
@@
-54,9
+55,9
@@
// event tables and other macros
// ----------------------------------------------------------------------------
// event tables and other macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wx
Control
)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wx
TextCtrlBase
)
-BEGIN_EVENT_TABLE(wxTextCtrl, wx
Control
)
+BEGIN_EVENT_TABLE(wxTextCtrl, wx
TextCtrlBase
)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
@@
-101,9
+102,6
@@
bool wxTextCtrl::Create(
, const wxString& rsName
)
{
, const wxString& rsName
)
{
- HWND hParent;
- int nTempy;
-
//
// Base initialization
//
//
// Base initialization
//
@@
-115,7
+113,7
@@
bool wxTextCtrl::Create(
,rValidator
,rsName
))
,rValidator
,rsName
))
- return
FALSE
;
+ return
false
;
wxPoint vPos = rPos; // The OS/2 position
SWP vSwp;
wxPoint vPos = rPos; // The OS/2 position
SWP vSwp;
@@
-126,7
+124,8
@@
bool wxTextCtrl::Create(
}
m_windowStyle = lStyle;
}
m_windowStyle = lStyle;
- m_bIsMLE = FALSE;
+ m_bIsMLE = false;
+ m_bSkipUpdate = false;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
@@
-136,7
+135,7
@@
bool wxTextCtrl::Create(
if ( m_windowStyle & wxTE_MULTILINE )
{
lSstyle |= MLS_BORDER | MLS_WORDWRAP;
if ( m_windowStyle & wxTE_MULTILINE )
{
lSstyle |= MLS_BORDER | MLS_WORDWRAP;
- m_bIsMLE =
TRUE
;
+ m_bIsMLE =
true
;
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
lSstyle |= MLS_VSCROLL;
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
lSstyle |= MLS_VSCROLL;
@@
-161,7
+160,7
@@
bool wxTextCtrl::Create(
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_MLE // Window class
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_MLE // Window class
- ,
(PSZ)
rsValue.c_str() // Initial Text
+ ,rsValue.c_str() // Initial Text
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
@@
-178,7
+177,7
@@
bool wxTextCtrl::Create(
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_ENTRYFIELD // Window class
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_ENTRYFIELD // Window class
- ,
(PSZ)
rsValue.c_str() // Initial Text
+ ,rsValue.c_str() // Initial Text
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
@@
-194,7
+193,7
@@
bool wxTextCtrl::Create(
if (m_hWnd == 0)
{
if (m_hWnd == 0)
{
- return
FALSE
;
+ return
false
;
}
SubclassWin(GetHWND());
}
SubclassWin(GetHWND());
@@
-208,7
+207,7
@@
bool wxTextCtrl::Create(
,wxNORMAL
);
SetFont(*pTextFont);
,wxNORMAL
);
SetFont(*pTextFont);
- if (!rsValue.
IsE
mpty())
+ if (!rsValue.
e
mpty())
{
SetValue(rsValue);
}
{
SetValue(rsValue);
}
@@
-226,7
+225,7
@@
bool wxTextCtrl::Create(
,rSize.y
);
delete pTextFont;
,rSize.y
);
delete pTextFont;
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::Create
//
} // end of wxTextCtrl::Create
//
@@
-330,7
+329,8
@@
void wxTextCtrl::SetupColours()
wxString wxTextCtrl::GetValue() const
{
wxString sStr = wxGetWindowText(GetHWND());
wxString wxTextCtrl::GetValue() const
{
wxString sStr = wxGetWindowText(GetHWND());
- char* zStr = (char*)sStr.c_str();
+ wxCharBuffer buf(sStr.char_str());
+ char* zStr = buf.data();
for ( ; *zStr; zStr++ )
{
for ( ; *zStr; zStr++ )
{
@@
-342,11
+342,12
@@
wxString wxTextCtrl::GetValue() const
if (*zStr == '\r')
*zStr = '\n';
}
if (*zStr == '\r')
*zStr = '\n';
}
- return
s
Str;
+ return
z
Str;
} // end of wxTextCtrl::GetValue
} // end of wxTextCtrl::GetValue
-void wxTextCtrl::SetValue(
- const wxString& rsValue
+void wxTextCtrl::DoSetValue(
+ const wxString& rsValue,
+ int flags
)
{
//
)
{
//
@@
-357,6
+358,9
@@
void wxTextCtrl::SetValue(
//
if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
{
//
if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
{
+ if ( flags & SetValue_SendEvent )
+ m_bSkipUpdate = true;
+
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
}
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
}
@@
-367,7
+371,7
@@
void wxTextCtrl::WriteText(
)
{
if (m_bIsMLE)
)
{
if (m_bIsMLE)
- ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(
(PCHAR)rsValue.c
_str()), MPARAM(0));
+ ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(
rsValue.wx
_str()), MPARAM(0));
else
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
else
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
@@
-459,10
+463,10
@@
bool wxTextCtrl::CanCut() const
bool wxTextCtrl::CanPaste() const
{
bool wxTextCtrl::CanPaste() const
{
- bool bIsTextAvailable =
FALSE
;
+ bool bIsTextAvailable =
false
;
if (!IsEditable())
if (!IsEditable())
- return
FALSE
;
+ return
false
;
//
// Check for straight text on clipboard
//
// Check for straight text on clipboard
@@
-505,7
+509,7
@@
void wxTextCtrl::SetInsertionPoint(
void wxTextCtrl::SetInsertionPointEnd()
{
void wxTextCtrl::SetInsertionPointEnd()
{
-
long
lPos = GetLastPosition();
+
wxTextPos
lPos = GetLastPosition();
//
// We must not do anything if the caret is already there because calling
//
// We must not do anything if the caret is already there because calling
@@
-533,7
+537,7
@@
long wxTextCtrl::GetInsertionPoint() const
return (dwPos & 0xFFFF);
} // end of wxTextCtrl::GetInsertionPoint
return (dwPos & 0xFFFF);
} // end of wxTextCtrl::GetInsertionPoint
-
long
wxTextCtrl::GetLastPosition() const
+
wxTextPos
wxTextCtrl::GetLastPosition() const
{
HWND hWnd = GetHwnd();
long lCharIndex;
{
HWND hWnd = GetHwnd();
long lCharIndex;
@@
-599,16
+603,12
@@
bool wxTextCtrl::IsEditable() const
// Editing
// ----------------------------------------------------------------------------
// Editing
// ----------------------------------------------------------------------------
-void wxTextCtrl::Replace(
- long lFrom
-, long lTo
-, const wxString& rsValue
-)
+void wxTextCtrl::Replace( long lFrom,
+ long lTo,
+ const wxString& rsValue )
{
#if wxUSE_CLIPBOARD
{
#if wxUSE_CLIPBOARD
- HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
+ HWND hWnd = GetHwnd();
//
// Set selection and remove it
//
// Set selection and remove it
@@
-635,6
+635,9
@@
void wxTextCtrl::Replace(
else
::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0);
#else
else
::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0);
#else
+ wxUnusedVar(lFrom);
+ wxUnusedVar(lTo);
+ wxUnusedVar(rsValue);
wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0.");
#endif
} // end of wxTextCtrl::Replace
wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0.");
#endif
} // end of wxTextCtrl::Replace
@@
-645,8
+648,6
@@
void wxTextCtrl::Remove(
)
{
HWND hWnd = GetHwnd();
)
{
HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
if (m_bIsMLE)
{
if (m_bIsMLE)
{
@@
-670,7
+671,7
@@
void wxTextCtrl::SetSelection(
long lToChar = lTo;
//
long lToChar = lTo;
//
- // If from and to are both -1, it means (in wxWi
ndow
s) that all text should
+ // If from and to are both -1, it means (in wxWi
dget
s) that all text should
// be selected. Translate into Windows convention
//
if ((lFrom == -1L) && (lTo == -1L))
// be selected. Translate into Windows convention
//
if ((lFrom == -1L) && (lTo == -1L))
@@
-684,20
+685,21
@@
void wxTextCtrl::SetSelection(
::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar), (MPARAM)0);
} // end of wxTextCtrl::SetSelection
::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar), (MPARAM)0);
} // end of wxTextCtrl::SetSelection
-bool wxTextCtrl::LoadFile(
- const wxString& rsFile
+bool wxTextCtrl::DoLoadFile(
+ const wxString& rsFile,
+ int fileType
)
{
)
{
- if ( wxTextCtrlBase::
LoadFile(rsFil
e) )
+ if ( wxTextCtrlBase::
DoLoadFile(rsFile, fileTyp
e) )
{
//
// Update the size limit if needed
//
AdjustSpaceLimit();
{
//
// Update the size limit if needed
//
AdjustSpaceLimit();
- return
TRUE
;
+ return
true
;
}
}
- return
FALSE
;
-} // end of wxTextCtrl::LoadFile
+ return
false
;
+} // end of wxTextCtrl::
Do
LoadFile
bool wxTextCtrl::IsModified() const
{
bool wxTextCtrl::IsModified() const
{
@@
-749,7
+751,6
@@
long wxTextCtrl::XYToPosition(
, long lY
) const
{
, long lY
) const
{
- HWND hWnd = GetHwnd();
long lCharIndex = 0L;
long lLen;
long lCharIndex = 0L;
long lLen;
@@
-781,7
+782,7
@@
bool wxTextCtrl::PositionToXY(
if (nLineNo == -1)
{
// no such line
if (nLineNo == -1)
{
// no such line
- return
FALSE
;
+ return
false
;
}
//
}
//
@@
-813,7
+814,7
@@
bool wxTextCtrl::PositionToXY(
if (lCharIndex == -1)
{
if (lCharIndex == -1)
{
- return
FALSE
;
+ return
false
;
}
//
}
//
@@
-824,15
+825,13
@@
bool wxTextCtrl::PositionToXY(
if (plY)
*plY = nLineNo;
if (plY)
*plY = nLineNo;
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::PositionToXY
} // end of wxTextCtrl::PositionToXY
-void wxTextCtrl::ShowPosition(
- long lPos
-)
+void wxTextCtrl::ShowPosition( long WXUNUSED(lPos) )
{
{
- HWND
hWnd = GetHwnd();
- long
lCurrentLineLineNo = 0L;
+ HWND hWnd = GetHwnd();
+ long lCurrentLineLineNo = 0L;
// To scroll to a position, we pass the number of lines and characters
// to scroll *by*. This means that we need to:
// To scroll to a position, we pass the number of lines and characters
// to scroll *by*. This means that we need to:
@@
-859,17
+858,17
@@
void wxTextCtrl::ShowPosition(
}
} // end of wxTextCtrl::ShowPosition
}
} // end of wxTextCtrl::ShowPosition
-int wxTextCtrl::GetLineLength(
- long lLineNo
-) const
+int wxTextCtrl::GetLineLength( long WXUNUSED(lLineNo) ) const
{
{
- long
lLen = 0L;
+ long lLen = 0L;
if (m_bIsMLE)
if (m_bIsMLE)
+ {
lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0);
lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0);
+ }
else
{
else
{
- WNDPARAMS
vParams;
+ WNDPARAMS vParams;
vParams.fsStatus = WPM_CCHTEXT;
if (::WinSendMsg( GetHwnd()
vParams.fsStatus = WPM_CCHTEXT;
if (::WinSendMsg( GetHwnd()
@@
-892,14
+891,14
@@
wxString wxTextCtrl::GetLineText(
{
long lLen = (long)GetLineLength((long)lLineNo) + 1;
wxString sStr;
{
long lLen = (long)GetLineLength((long)lLineNo) + 1;
wxString sStr;
-
char*
zBuf;
+
wxChar*
zBuf;
//
// There must be at least enough place for the length WORD in the
// buffer
//
lLen += sizeof(WORD);
//
// There must be at least enough place for the length WORD in the
// buffer
//
lLen += sizeof(WORD);
- zBuf = new
c
har[lLen];
+ zBuf = new
wxC
har[lLen];
if (m_bIsMLE)
{
long lIndex;
if (m_bIsMLE)
{
long lIndex;
@@
-910,7
+909,7
@@
wxString wxTextCtrl::GetLineText(
lIndex = lLen * lLineNo;
::WinSendMsg(GetHwnd(), MLM_SETSEL, (MPARAM)lIndex, (MPARAM)lIndex);
lIndex = lLen * lLineNo;
::WinSendMsg(GetHwnd(), MLM_SETSEL, (MPARAM)lIndex, (MPARAM)lIndex);
- ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)
sizeof
(zBuf)));
+ ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)
WXSIZEOF
(zBuf)));
lBuflen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYFORMATTEXTLENGTH, MPFROMLONG(lIndex), MPFROMLONG(-1));
lCopied = (long)::WinSendMsg(GetHwnd(), MLM_EXPORT, MPFROMP(&lIndex), MPFROMP(&lBuflen));
zBuf[lCopied] = '\0';
lBuflen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYFORMATTEXTLENGTH, MPFROMLONG(lIndex), MPFROMLONG(-1));
lCopied = (long)::WinSendMsg(GetHwnd(), MLM_EXPORT, MPFROMP(&lIndex), MPFROMP(&lBuflen));
zBuf[lCopied] = '\0';
@@
-925,7
+924,7
@@
wxString wxTextCtrl::GetLineText(
,&vParams
,0
))
,&vParams
,0
))
- memcpy(zBuf, vParams.pszText, vParams.cchText);
+ memcpy(
(char*)
zBuf, vParams.pszText, vParams.cchText);
zBuf[vParams.cchText] = '\0';
}
sStr = zBuf;
zBuf[vParams.cchText] = '\0';
}
sStr = zBuf;
@@
-964,7
+963,7
@@
bool wxTextCtrl::CanUndo() const
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
- bOk =
FALSE
; // can't undo regular edit fields in PM
+ bOk =
false
; // can't undo regular edit fields in PM
return bOk;
} // end of wxTextCtrl::CanUndo
return bOk;
} // end of wxTextCtrl::CanUndo
@@
-975,7
+974,7
@@
bool wxTextCtrl::CanRedo() const
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
- bOk =
FALSE
; // can't undo regular edit fields in PM
+ bOk =
false
; // can't undo regular edit fields in PM
return bOk;
} // end of wxTextCtrl::CanRedo
return bOk;
} // end of wxTextCtrl::CanRedo
@@
-1002,22
+1001,17
@@
void wxTextCtrl::OnDropFiles(
}
} // end of wxTextCtrl::OnDropFiles
}
} // end of wxTextCtrl::OnDropFiles
-WXHBRUSH wxTextCtrl::OnCtlColor(
- WXHDC hWxDC
-, WXHWND hWnd
-, WXUINT uCtlColor
-, WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+WXHBRUSH wxTextCtrl::OnCtlColor( WXHDC hWxDC,
+ WXHWND WXUNUSED(hWnd),
+ WXUINT WXUNUSED(uCtlColor),
+ WXUINT WXUNUSED(uMessage),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam) )
{
{
- HPS hPS = (HPS)hWxDC;
- wxBrush* pBrush = NULL;
- wxColour vColBack = GetBackgroundColour();
- wxColour vColFore = GetForegroundColour();
- wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
- ,wxSOLID
- );
+ HPS hPS = (HPS)hWxDC;
+ wxColour vColBack = GetBackgroundColour();
+ wxColour vColFore = GetForegroundColour();
+ wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( vColBack, wxSOLID );
if (m_bUseCtl3D)
{
if (m_bUseCtl3D)
{
@@
-1047,7
+1041,7
@@
void wxTextCtrl::OnChar(
wxKeyEvent& rEvent
)
{
wxKeyEvent& rEvent
)
{
- switch (rEvent.KeyCode())
+ switch (rEvent.
Get
KeyCode())
{
case WXK_RETURN:
if ( !(m_windowStyle & wxTE_MULTILINE) )
{
case WXK_RETURN:
if ( !(m_windowStyle & wxTE_MULTILINE) )
@@
-1074,7
+1068,7
@@
void wxTextCtrl::OnChar(
wxNavigationKeyEvent vEventNav;
vEventNav.SetDirection(!rEvent.ShiftDown());
wxNavigationKeyEvent vEventNav;
vEventNav.SetDirection(!rEvent.ShiftDown());
- vEventNav.SetWindowChange(
FALSE
);
+ vEventNav.SetWindowChange(
false
);
vEventNav.SetEventObject(this);
if ( GetEventHandler()->ProcessEvent(vEventNav) )
vEventNav.SetEventObject(this);
if ( GetEventHandler()->ProcessEvent(vEventNav) )
@@
-1107,12
+1101,17
@@
bool wxTextCtrl::OS2Command(
case EN_CHANGE:
{
case EN_CHANGE:
{
+ if (m_bSkipUpdate)
+ {
+ m_bSkipUpdate = false;
+ break;
+ }
+
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,m_windowId
);
InitCommandEvent(vEvent);
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,m_windowId
);
InitCommandEvent(vEvent);
- vEvent.SetString((char*)GetValue().c_str());
ProcessCommand(vEvent);
}
break;
ProcessCommand(vEvent);
}
break;
@@
-1127,15
+1126,15
@@
bool wxTextCtrl::OS2Command(
case EN_SCROLL:
case EN_INSERTMODETOGGLE:
case EN_MEMERROR:
case EN_SCROLL:
case EN_INSERTMODETOGGLE:
case EN_MEMERROR:
- return
FALSE
;
+ return
false
;
default:
default:
- return
FALSE
;
+ return
false
;
}
//
// Processed
//
}
//
// Processed
//
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::OS2Command
void wxTextCtrl::AdjustSpaceLimit()
} // end of wxTextCtrl::OS2Command
void wxTextCtrl::AdjustSpaceLimit()
@@
-1158,7
+1157,7
@@
void wxTextCtrl::AdjustSpaceLimit()
WNDPARAMS vParams;
vParams.fsStatus = WPM_CBCTLDATA;
WNDPARAMS vParams;
vParams.fsStatus = WPM_CBCTLDATA;
- vParams.pCtlData = &Efd;
+
vParams.pCtlData = &Efd;
vParams.cbCtlData = sizeof(ENTRYFDATA);
if (::WinSendMsg( GetHwnd()
vParams.cbCtlData = sizeof(ENTRYFDATA);
if (::WinSendMsg( GetHwnd()
@@
-1172,11
+1171,17
@@
void wxTextCtrl::AdjustSpaceLimit()
}
if (uLen >= uLimit)
{
}
if (uLen >= uLimit)
{
- uLimit = uLen + 0x8000; // 32Kb
- if (uLimit > 0xffff)
+ if (m_bIsMLE)
{
{
- uLimit = 0L;
+ uLimit = uLen + 0x8000; // 32Kb
+ if (uLimit > 0xffff)
+ {
+ uLimit = 0L;
+ }
}
}
+ else
+ uLimit = 0x7fff;
+
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
else
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
else
@@
-1198,11
+1203,12
@@
wxSize wxTextCtrl::DoGetBestSize() const
{
int nCx;
int nCy;
{
int nCx;
int nCy;
+ wxFont vFont = (wxFont)GetFont();
- wxGetCharSize(GetHWND(), &nCx, &nCy,
(wxFont*)&GetFont()
);
+ wxGetCharSize(GetHWND(), &nCx, &nCy,
&vFont
);
int wText = DEFAULT_ITEM_WIDTH;
int wText = DEFAULT_ITEM_WIDTH;
- int hText = (EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
+ int hText = (
int)(
EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
if (m_windowStyle & wxTE_MULTILINE)
{
if (m_windowStyle & wxTE_MULTILINE)
{
@@
-1216,148
+1222,107
@@
wxSize wxTextCtrl::DoGetBestSize() const
// standard handlers for standard edit menu events
// ----------------------------------------------------------------------------
// standard handlers for standard edit menu events
// ----------------------------------------------------------------------------
-void wxTextCtrl::OnCut(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnCut( wxCommandEvent& WXUNUSED(rEvent) )
{
Cut();
} // end of wxTextCtrl::OnCut
{
Cut();
} // end of wxTextCtrl::OnCut
-void wxTextCtrl::OnCopy(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnCopy( wxCommandEvent& WXUNUSED(rEvent) )
{
Copy();
} // end of wxTextCtrl::OnCopy
{
Copy();
} // end of wxTextCtrl::OnCopy
-void wxTextCtrl::OnPaste(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnPaste( wxCommandEvent& WXUNUSED(rEvent) )
{
Paste();
} // end of wxTextCtrl::OnPaste
{
Paste();
} // end of wxTextCtrl::OnPaste
-void wxTextCtrl::OnUndo(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnUndo( wxCommandEvent& WXUNUSED(rEvent) )
{
Undo();
} // end of wxTextCtrl::OnUndo
{
Undo();
} // end of wxTextCtrl::OnUndo
-void wxTextCtrl::OnRedo(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnRedo( wxCommandEvent& WXUNUSED(rEvent) )
{
Redo();
} // end of wxTextCtrl::OnRedo
{
Redo();
} // end of wxTextCtrl::OnRedo
-void wxTextCtrl::OnDelete(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnDelete( wxCommandEvent& WXUNUSED(rEvent) )
{
{
- long lFrom;
- long lTo;
+ long lFrom, lTo;
+
+ GetSelection( &lFrom, &lTo );
- GetSelection( &lFrom
- ,&lTo
- );
if (lFrom != -1 && lTo != -1)
if (lFrom != -1 && lTo != -1)
- Remove( lFrom
- ,lTo
- );
+ Remove( lFrom, lTo );
} // end of wxTextCtrl::OnDelete
} // end of wxTextCtrl::OnDelete
-void wxTextCtrl::OnSelectAll(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnSelectAll( wxCommandEvent& WXUNUSED(rEvent) )
{
SetSelection(-1, -1);
} // end of wxTextCtrl::OnSelectAll
{
SetSelection(-1, -1);
} // end of wxTextCtrl::OnSelectAll
-void wxTextCtrl::OnUpdateCut(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateCut( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanCut());
} // end of wxTextCtrl::OnUpdateCut
{
rEvent.Enable(CanCut());
} // end of wxTextCtrl::OnUpdateCut
-void wxTextCtrl::OnUpdateCopy(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateCopy( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanCopy());
} // end of wxTextCtrl::OnUpdateCopy
{
rEvent.Enable(CanCopy());
} // end of wxTextCtrl::OnUpdateCopy
-void wxTextCtrl::OnUpdatePaste(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdatePaste( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanPaste());
} // end of wxTextCtrl::OnUpdatePaste
{
rEvent.Enable(CanPaste());
} // end of wxTextCtrl::OnUpdatePaste
-void wxTextCtrl::OnUpdateUndo(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateUndo( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanUndo());
} // end of wxTextCtrl::OnUpdateUndo
{
rEvent.Enable(CanUndo());
} // end of wxTextCtrl::OnUpdateUndo
-void wxTextCtrl::OnUpdateRedo(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateRedo( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanRedo());
} // end of wxTextCtrl::OnUpdateRedo
{
rEvent.Enable(CanRedo());
} // end of wxTextCtrl::OnUpdateRedo
-void wxTextCtrl::OnUpdateDelete(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateDelete( wxUpdateUIEvent& rEvent )
{
{
- long lFrom;
- long lTo;
+ long lFrom, lTo;
- GetSelection( &lFrom
- ,&lTo
- );
+ GetSelection( &lFrom, &lTo );
rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ;
} // end of wxTextCtrl::OnUpdateDelete
rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ;
} // end of wxTextCtrl::OnUpdateDelete
-void wxTextCtrl::OnUpdateSelectAll(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateSelectAll( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(GetLastPosition() > 0);
} // end of wxTextCtrl::OnUpdateSelectAll
{
rEvent.Enable(GetLastPosition() > 0);
} // end of wxTextCtrl::OnUpdateSelectAll
-bool wxTextCtrl::SetBackgroundColour(
- const wxColour& rColour
-)
+bool wxTextCtrl::SetBackgroundColour( const wxColour& rColour )
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::SetBackgroundColour
} // end of wxTextCtrl::SetBackgroundColour
-bool wxTextCtrl::SetForegroundColour(
- const wxColour& rColour
-)
+bool wxTextCtrl::SetForegroundColour( const wxColour& rColour )
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::SetForegroundColour
} // end of wxTextCtrl::SetForegroundColour
-bool wxTextCtrl::SetStyle(
- long lStart
-, long lEnd
-, const wxTextAttr& rStyle
-)
+bool wxTextCtrl::SetStyle( long lStart,
+ long lEnd,
+ const wxTextAttr& WXUNUSED(rStyle) )
{
{
- HWND
hWnd = GetHwnd();
+ HWND hWnd = GetHwnd();
if (lStart > lEnd)
{
if (lStart > lEnd)
{
- long
lTmp = lStart;
+ long lTmp = lStart;
lStart = lEnd;
lEnd = lTmp;
lStart = lEnd;
lEnd = lTmp;
@@
-1367,18
+1332,15
@@
bool wxTextCtrl::SetStyle(
// We can only change the format of the selection, so select the range we
// want and restore the old selection later
//
// 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;
+ long lStartOld, lEndOld;
- GetSelection( &lStartOld
- ,&lEndOld
- );
+ GetSelection( &lStartOld, &lEndOld );
//
// But do we really have to change the selection?
//
//
// But do we really have to change the selection?
//
- bool
bChangeSel = lStart != lStartOld ||
-
lEnd != lEndOld;
+ bool bChangeSel = lStart != lStartOld ||
+ lEnd != lEndOld;
if (bChangeSel)
{
if (bChangeSel)
{
@@
-1391,6
+1353,5
@@
bool wxTextCtrl::SetStyle(
//
// TODO:: finish this part
//
//
// TODO:: finish this part
//
- return
TRUE
;
+ return
true
;
} // end of wxTextCtrl::SetStyle
} // end of wxTextCtrl::SetStyle
-
projects / wxWidgets.git / blobdiff