Lots of updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -92,7 +92,6 @@ public:
|
|||||||
void SetRadioGroupStart(int nStart);
|
void SetRadioGroupStart(int nStart);
|
||||||
void SetRadioGroupEnd(int nEnd);
|
void SetRadioGroupEnd(int nEnd);
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// All OS/2PM Submenus and menus have one of these
|
// All OS/2PM Submenus and menus have one of these
|
||||||
//
|
//
|
||||||
|
@@ -79,6 +79,7 @@ public:
|
|||||||
|
|
||||||
virtual void WriteText(const wxString& rsText);
|
virtual void WriteText(const wxString& rsText);
|
||||||
virtual void AppendText(const wxString& rsText);
|
virtual void AppendText(const wxString& rsText);
|
||||||
|
virtual bool EmulateKeyPress(const wxKeyEvent& rEvent);
|
||||||
|
|
||||||
virtual bool SetStyle( long lStart
|
virtual bool SetStyle( long lStart
|
||||||
,long lEnd
|
,long lEnd
|
||||||
|
@@ -409,10 +409,10 @@ public:
|
|||||||
,WXLPARAM lParam
|
,WXLPARAM lParam
|
||||||
,bool bIsASCII = FALSE
|
,bool bIsASCII = FALSE
|
||||||
);
|
);
|
||||||
bool HandleKeyDown( WXWORD wParam
|
bool HandleKeyDown( WXWPARAM wParam
|
||||||
,WXLPARAM lParam
|
,WXLPARAM lParam
|
||||||
);
|
);
|
||||||
bool HandleKeyUp( WXDWORD wParam
|
bool HandleKeyUp( WXWPARAM wParam
|
||||||
,WXLPARAM lParam
|
,WXLPARAM lParam
|
||||||
);
|
);
|
||||||
bool HandleQueryDragIcon(WXHICON* phIcon);
|
bool HandleQueryDragIcon(WXHICON* phIcon);
|
||||||
@@ -581,7 +581,11 @@ private:
|
|||||||
,WXLPARAM* pResult
|
,WXLPARAM* pResult
|
||||||
);
|
);
|
||||||
// the helper functions used by HandleChar/KeyXXX methods
|
// the helper functions used by HandleChar/KeyXXX methods
|
||||||
wxKeyEvent CreateKeyEvent(wxEventType evType, int id, WXLPARAM lp) const;
|
wxKeyEvent CreateKeyEvent( wxEventType evType
|
||||||
|
,int nId
|
||||||
|
,WXLPARAM lParam = 0
|
||||||
|
,WXWPARAM wParam = 0
|
||||||
|
) const;
|
||||||
|
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
|
DECLARE_DYNAMIC_CLASS(wxWindowOS2);
|
||||||
|
@@ -516,10 +516,11 @@ bool wxBitmap::CreateFromImage (
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
|
wxCHECK_MSG(rImage.Ok(), FALSE, wxT("invalid image"));
|
||||||
|
m_refData = new wxBitmapRefData();
|
||||||
|
|
||||||
int nSizeLimit = 1024 * 768 * 3;
|
int nSizeLimit = 1024 * 768 * 3;
|
||||||
int nWidth = GetWidth();
|
int nWidth = rImage.GetWidth();
|
||||||
int nBmpHeight = GetHeight();
|
int nBmpHeight = rImage.GetHeight();
|
||||||
int nBytePerLine = nWidth * 3;
|
int nBytePerLine = nWidth * 3;
|
||||||
int nSizeDWORD = sizeof(DWORD);
|
int nSizeDWORD = sizeof(DWORD);
|
||||||
int nLineBoundary = nBytePerLine % nSizeDWORD;
|
int nLineBoundary = nBytePerLine % nSizeDWORD;
|
||||||
|
@@ -64,77 +64,29 @@ bool wxCheckBox::Create(
|
|||||||
, const wxString& rsName
|
, const wxString& rsName
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SetName(rsName);
|
if (!CreateControl( pParent
|
||||||
|
,vId
|
||||||
|
,rPos
|
||||||
|
,rSize
|
||||||
|
,lStyle
|
||||||
#if wxUSE_VALIDATORS
|
#if wxUSE_VALIDATORS
|
||||||
SetValidator(rValidator);
|
,wxDefaultValidator
|
||||||
#endif
|
#endif
|
||||||
if (pParent)
|
,rsName
|
||||||
pParent->AddChild(this);
|
))
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
SetBackgroundColour(pParent->GetBackgroundColour());
|
long osStyle = BS_AUTOCHECKBOX |
|
||||||
SetForegroundColour(pParent->GetForegroundColour());
|
WS_TABSTOP |
|
||||||
m_windowStyle = lStyle;
|
WS_VISIBLE;
|
||||||
|
|
||||||
wxString sLabel = rsLabel;
|
return OS2CreateControl( wxT("BUTTON")
|
||||||
|
,osStyle
|
||||||
if (sLabel == wxT(""))
|
,rPos
|
||||||
sLabel = wxT(" "); // Apparently needed or checkbox won't show
|
,rSize
|
||||||
|
,rsLabel
|
||||||
if (vId == -1 )
|
,0
|
||||||
m_windowId = NewControlId();
|
);
|
||||||
else
|
|
||||||
m_windowId = vId;
|
|
||||||
|
|
||||||
int nX = rPos.x;
|
|
||||||
int nY = rPos.y;
|
|
||||||
int nWidth = rSize.x;
|
|
||||||
int nHeight = rSize.y;
|
|
||||||
long lSstyle = 0L;
|
|
||||||
|
|
||||||
lSstyle = BS_AUTOCHECKBOX |
|
|
||||||
WS_TABSTOP |
|
|
||||||
WS_VISIBLE;
|
|
||||||
if (lStyle & wxCLIP_SIBLINGS )
|
|
||||||
lSstyle |= WS_CLIPSIBLINGS;
|
|
||||||
|
|
||||||
m_hWnd = (WXHWND)::WinCreateWindow ( GetHwndOf(pParent)
|
|
||||||
,WC_BUTTON
|
|
||||||
,rsLabel.c_str()
|
|
||||||
,lSstyle
|
|
||||||
,0, 0, 0, 0
|
|
||||||
,GetWinHwnd(pParent)
|
|
||||||
,HWND_TOP
|
|
||||||
,(HMENU)m_windowId
|
|
||||||
,NULL
|
|
||||||
,NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
//
|
|
||||||
// Subclass again for purposes of dialog editing mode
|
|
||||||
//
|
|
||||||
SubclassWin(m_hWnd);
|
|
||||||
|
|
||||||
LONG lColor = (LONG)m_backgroundColour.GetPixel();
|
|
||||||
|
|
||||||
::WinSetPresParam( m_hWnd
|
|
||||||
,PP_BACKGROUNDCOLOR
|
|
||||||
,sizeof(LONG)
|
|
||||||
,(PVOID)&lColor
|
|
||||||
);
|
|
||||||
|
|
||||||
wxFont* pTextFont = new wxFont( 10
|
|
||||||
,wxMODERN
|
|
||||||
,wxNORMAL
|
|
||||||
,wxNORMAL
|
|
||||||
);
|
|
||||||
SetFont(*pTextFont);
|
|
||||||
SetSize( nX
|
|
||||||
,nY
|
|
||||||
,nWidth
|
|
||||||
,nHeight
|
|
||||||
);
|
|
||||||
delete pTextFont;
|
|
||||||
return TRUE;
|
|
||||||
} // end of wxCheckBox::Create
|
} // end of wxCheckBox::Create
|
||||||
|
|
||||||
void wxCheckBox::SetLabel(
|
void wxCheckBox::SetLabel(
|
||||||
|
@@ -409,12 +409,12 @@ bool wxComboBox::ProcessEditMsg(
|
|||||||
));
|
));
|
||||||
|
|
||||||
case KC_PREVDOWN:
|
case KC_PREVDOWN:
|
||||||
return (HandleKeyDown( SHORT1FROMMP(wParam)
|
return (HandleKeyDown( wParam
|
||||||
,lParam
|
,lParam
|
||||||
));
|
));
|
||||||
|
|
||||||
case KC_KEYUP:
|
case KC_KEYUP:
|
||||||
return (HandleKeyUp( SHORT1FROMMP(wParam)
|
return (HandleKeyUp( wParam
|
||||||
,lParam
|
,lParam
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
@@ -701,7 +701,6 @@ void wxNativeFontInfo::SetEncoding(
|
|||||||
,&vInfo
|
,&vInfo
|
||||||
))
|
))
|
||||||
{
|
{
|
||||||
#if wxUSE_FONTMAP
|
|
||||||
if (wxFontMapper::Get()->GetAltForEncoding( eEncoding
|
if (wxFontMapper::Get()->GetAltForEncoding( eEncoding
|
||||||
,&vInfo
|
,&vInfo
|
||||||
))
|
))
|
||||||
@@ -717,7 +716,6 @@ void wxNativeFontInfo::SetEncoding(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif // wxUSE_FONTMAP
|
|
||||||
{
|
{
|
||||||
// unsupported encoding, replace with the default
|
// unsupported encoding, replace with the default
|
||||||
vInfo.charset = 850;
|
vInfo.charset = 850;
|
||||||
|
@@ -215,45 +215,58 @@ void wxMenu::UpdateAccel(
|
|||||||
wxMenuItem* pItem
|
wxMenuItem* pItem
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
//
|
if (pItem->IsSubMenu())
|
||||||
// Find the (new) accel for this item
|
|
||||||
//
|
|
||||||
wxAcceleratorEntry* pAccel = wxGetAccelFromString(pItem->GetText());
|
|
||||||
|
|
||||||
if (pAccel)
|
|
||||||
pAccel->m_command = pItem->GetId();
|
|
||||||
|
|
||||||
//
|
|
||||||
// Find the old one
|
|
||||||
//
|
|
||||||
int n = FindAccel(pItem->GetId());
|
|
||||||
|
|
||||||
if (n == wxNOT_FOUND)
|
|
||||||
{
|
{
|
||||||
//
|
wxMenu* pSubmenu = pItem->GetSubMenu();
|
||||||
// No old, add new if any
|
wxMenuItemList::Node* pNode = pSubmenu->GetMenuItems().GetFirst();
|
||||||
//
|
|
||||||
if (pAccel)
|
while (pNode)
|
||||||
m_vAccels.Add(pAccel);
|
{
|
||||||
else
|
UpdateAccel(pNode->GetData());
|
||||||
return; // skipping RebuildAccelTable() below
|
pNode = pNode->GetNext();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (!pItem->IsSeparator())
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Replace old with new or just remove the old one if no new
|
// Find the (new) accel for this item
|
||||||
//
|
//
|
||||||
delete m_vAccels[n];
|
wxAcceleratorEntry* pAccel = wxGetAccelFromString(pItem->GetText());
|
||||||
|
|
||||||
if (pAccel)
|
if (pAccel)
|
||||||
m_vAccels[n] = pAccel;
|
pAccel->m_command = pItem->GetId();
|
||||||
else
|
|
||||||
m_vAccels.RemoveAt(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsAttached())
|
//
|
||||||
{
|
// Find the old one
|
||||||
m_menuBar->RebuildAccelTable();
|
//
|
||||||
|
int n = FindAccel(pItem->GetId());
|
||||||
|
|
||||||
|
if (n == wxNOT_FOUND)
|
||||||
|
{
|
||||||
|
//
|
||||||
|
// No old, add new if any
|
||||||
|
//
|
||||||
|
if (pAccel)
|
||||||
|
m_vAccels.Add(pAccel);
|
||||||
|
else
|
||||||
|
return; // skipping RebuildAccelTable() below
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//
|
||||||
|
// Replace old with new or just remove the old one if no new
|
||||||
|
//
|
||||||
|
delete m_vAccels[n];
|
||||||
|
|
||||||
|
if (pAccel)
|
||||||
|
m_vAccels[n] = pAccel;
|
||||||
|
else
|
||||||
|
m_vAccels.RemoveAt(n);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IsAttached())
|
||||||
|
{
|
||||||
|
m_menuBar->RebuildAccelTable();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} // wxMenu::UpdateAccel
|
} // wxMenu::UpdateAccel
|
||||||
|
|
||||||
|
@@ -262,6 +262,7 @@ void wxMenuItem::SetRadioGroupEnd(
|
|||||||
m_vRadioGroup.m_nEnd = nEnd;
|
m_vRadioGroup.m_nEnd = nEnd;
|
||||||
} // end of wxMenuItem::SetRadioGroupEnd
|
} // end of wxMenuItem::SetRadioGroupEnd
|
||||||
|
|
||||||
|
|
||||||
// change item state
|
// change item state
|
||||||
// -----------------
|
// -----------------
|
||||||
|
|
||||||
@@ -303,7 +304,6 @@ void wxMenuItem::Check(
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
HMENU hMenu = GetHmenuOf(m_parentMenu);
|
HMENU hMenu = GetHmenuOf(m_parentMenu);
|
||||||
|
|
||||||
if ( GetKind() == wxITEM_RADIO )
|
if ( GetKind() == wxITEM_RADIO )
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
|
@@ -385,6 +385,14 @@ void wxTextCtrl::Clear()
|
|||||||
::WinSetWindowText(GetHwnd(), "");
|
::WinSetWindowText(GetHwnd(), "");
|
||||||
} // end of wxTextCtrl::Clear
|
} // end of wxTextCtrl::Clear
|
||||||
|
|
||||||
|
bool wxTextCtrl::EmulateKeyPress(
|
||||||
|
const wxKeyEvent& rEvent
|
||||||
|
)
|
||||||
|
{
|
||||||
|
SetFocus();
|
||||||
|
return(wxTextCtrlBase::EmulateKeyPress(rEvent));
|
||||||
|
} // end of wxTextCtrl::EmulateKeyPress
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// Clipboard operations
|
// Clipboard operations
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -92,6 +92,20 @@
|
|||||||
# define CW_USEDEFAULT ((int)0x80000000)
|
# define CW_USEDEFAULT ((int)0x80000000)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef VK_OEM_1
|
||||||
|
#define VK_OEM_1 0xBA
|
||||||
|
#define VK_OEM_PLUS 0xBB
|
||||||
|
#define VK_OEM_COMMA 0xBC
|
||||||
|
#define VK_OEM_MINUS 0xBD
|
||||||
|
#define VK_OEM_PERIOD 0xBE
|
||||||
|
#define VK_OEM_2 0xBF
|
||||||
|
#define VK_OEM_3 0xC0
|
||||||
|
#define VK_OEM_4 0xDB
|
||||||
|
#define VK_OEM_5 0xDC
|
||||||
|
#define VK_OEM_6 0xDD
|
||||||
|
#define VK_OEM_7 0xDE
|
||||||
|
#endif
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// global variables
|
// global variables
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -2701,7 +2715,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
|
|||||||
if (uKeyFlags & KC_KEYUP)
|
if (uKeyFlags & KC_KEYUP)
|
||||||
{
|
{
|
||||||
//TODO: check if the cast to WXWORD isn't causing trouble
|
//TODO: check if the cast to WXWORD isn't causing trouble
|
||||||
bProcessed = HandleKeyUp((WXDWORD)wParam, lParam);
|
bProcessed = HandleKeyUp(wParam, lParam);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else // keydown event
|
else // keydown event
|
||||||
@@ -2712,8 +2726,7 @@ MRESULT wxWindowOS2::OS2WindowProc(
|
|||||||
// return 0 now (we've handled it). DON't RETURN
|
// return 0 now (we've handled it). DON't RETURN
|
||||||
// we still need to process further
|
// we still need to process further
|
||||||
//
|
//
|
||||||
HandleKeyDown((WXDWORD)wParam, lParam);
|
m_bLastKeydownProcessed = HandleKeyDown(wParam, lParam);
|
||||||
m_bLastKeydownProcessed = TRUE;
|
|
||||||
if (uKeyFlags & KC_VIRTUALKEY)
|
if (uKeyFlags & KC_VIRTUALKEY)
|
||||||
{
|
{
|
||||||
USHORT uVk = SHORT2FROMMP((MPARAM)lParam);
|
USHORT uVk = SHORT2FROMMP((MPARAM)lParam);
|
||||||
@@ -2721,14 +2734,17 @@ MRESULT wxWindowOS2::OS2WindowProc(
|
|||||||
//
|
//
|
||||||
// We consider these message "not interesting" to OnChar
|
// We consider these message "not interesting" to OnChar
|
||||||
//
|
//
|
||||||
if (uVk == VK_SHIFT || uVk == VK_CTRL )
|
|
||||||
{
|
|
||||||
bProcessed = TRUE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
switch(uVk)
|
switch(uVk)
|
||||||
{
|
{
|
||||||
//
|
case VK_SHIFT:
|
||||||
|
case VK_CTRL:
|
||||||
|
case VK_MENU:
|
||||||
|
case VK_CAPSLOCK:
|
||||||
|
case VK_NUMLOCK:
|
||||||
|
case VK_SCRLLOCK:
|
||||||
|
bProcessed = TRUE;
|
||||||
|
break;
|
||||||
|
|
||||||
// Avoid duplicate messages to OnChar for these ASCII keys: they
|
// Avoid duplicate messages to OnChar for these ASCII keys: they
|
||||||
// will be translated by TranslateMessage() and received in WM_CHAR
|
// will be translated by TranslateMessage() and received in WM_CHAR
|
||||||
case VK_ESC:
|
case VK_ESC:
|
||||||
@@ -2742,19 +2758,41 @@ MRESULT wxWindowOS2::OS2WindowProc(
|
|||||||
bProcessed = FALSE;
|
bProcessed = FALSE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VK_LEFT:
|
|
||||||
case VK_RIGHT:
|
|
||||||
case VK_DOWN:
|
|
||||||
case VK_UP:
|
|
||||||
default:
|
default:
|
||||||
bProcessed = HandleChar((WXDWORD)wParam, lParam);
|
if (m_bLastKeydownProcessed)
|
||||||
|
{
|
||||||
|
//
|
||||||
|
// The key was handled in the EVT_KEY_DOWN and handling
|
||||||
|
// a key in an EVT_KEY_DOWN handler is meant, by
|
||||||
|
// design, to prevent EVT_CHARs from happening
|
||||||
|
//
|
||||||
|
m_bLastKeydownProcessed = FALSE;
|
||||||
|
bProcessed = TRUE;
|
||||||
|
}
|
||||||
|
else // do generate a CHAR event
|
||||||
|
{
|
||||||
|
bProcessed = HandleChar((WXDWORD)wParam, lParam);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else // WM_CHAR -- Always an ASCII character
|
else // WM_CHAR -- Always an ASCII character
|
||||||
{
|
{
|
||||||
bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE);
|
if (m_bLastKeydownProcessed)
|
||||||
break;
|
{
|
||||||
|
//
|
||||||
|
// The key was handled in the EVT_KEY_DOWN and handling
|
||||||
|
// a key in an EVT_KEY_DOWN handler is meant, by
|
||||||
|
// design, to prevent EVT_CHARs from happening
|
||||||
|
//
|
||||||
|
m_bLastKeydownProcessed = FALSE;
|
||||||
|
bProcessed = TRUE;
|
||||||
|
}
|
||||||
|
else // do generate a CHAR event
|
||||||
|
{
|
||||||
|
bProcessed = HandleChar((WXDWORD)wParam, lParam, TRUE);
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3971,6 +4009,7 @@ wxKeyEvent wxWindowOS2::CreateKeyEvent(
|
|||||||
wxEventType eType
|
wxEventType eType
|
||||||
, int nId
|
, int nId
|
||||||
, WXLPARAM lParam
|
, WXLPARAM lParam
|
||||||
|
, WXWPARAM wParam
|
||||||
) const
|
) const
|
||||||
{
|
{
|
||||||
wxKeyEvent vEvent(eType);
|
wxKeyEvent vEvent(eType);
|
||||||
@@ -3982,6 +4021,8 @@ wxKeyEvent wxWindowOS2::CreateKeyEvent(
|
|||||||
|
|
||||||
vEvent.m_eventObject = (wxWindow *)this; // const_cast
|
vEvent.m_eventObject = (wxWindow *)this; // const_cast
|
||||||
vEvent.m_keyCode = nId;
|
vEvent.m_keyCode = nId;
|
||||||
|
vEvent.m_rawCode = (wxUint32)wParam;
|
||||||
|
vEvent.m_rawFlags = (wxUint32)lParam;
|
||||||
vEvent.SetTimestamp(s_currentMsg.time);
|
vEvent.SetTimestamp(s_currentMsg.time);
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -4051,57 +4092,50 @@ bool wxWindowOS2::HandleChar(
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
bCtrlDown = TRUE;
|
bCtrlDown = TRUE;
|
||||||
vId = vId + 96;
|
vId = vId + 'a' - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( (vId = wxCharCodeOS2ToWX(wParam)) == 0)
|
else // we're called from WM_KEYDOWN
|
||||||
{
|
{
|
||||||
//
|
vId = wxCharCodeOS2ToWX(wParam);
|
||||||
// It's ASCII and will be processed here only when called from
|
if (vId == 0)
|
||||||
// WM_CHAR (i.e. when isASCII = TRUE), don't process it now
|
return FALSE;
|
||||||
//
|
|
||||||
vId = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vId != -1)
|
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR
|
||||||
{
|
|
||||||
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_CHAR
|
|
||||||
,vId
|
,vId
|
||||||
,lParam
|
,lParam
|
||||||
));
|
));
|
||||||
|
|
||||||
if (bCtrlDown)
|
if (bCtrlDown)
|
||||||
{
|
{
|
||||||
vEvent.m_controlDown = TRUE;
|
vEvent.m_controlDown = TRUE;
|
||||||
}
|
|
||||||
|
|
||||||
if (GetEventHandler()->ProcessEvent(vEvent))
|
|
||||||
return TRUE;
|
|
||||||
}
|
}
|
||||||
return FALSE;
|
return (GetEventHandler()->ProcessEvent(vEvent));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxWindowOS2::HandleKeyDown(
|
bool wxWindowOS2::HandleKeyDown(
|
||||||
WXWORD wParam
|
WXWPARAM wParam
|
||||||
, WXLPARAM lParam
|
, WXLPARAM lParam
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
int nId = wxCharCodeOS2ToWX(wParam);
|
int nId = wxCharCodeOS2ToWX((int)wParam);
|
||||||
|
|
||||||
if (!nId)
|
if (!nId)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Normal ASCII char
|
// Normal ASCII char
|
||||||
//
|
//
|
||||||
nId = wParam;
|
nId = (int)wParam;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nId != -1)
|
if (nId != -1)
|
||||||
{
|
{
|
||||||
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
|
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_DOWN
|
||||||
,nId
|
,nId
|
||||||
,lParam
|
,(MPARAM)lParam
|
||||||
|
,(MPARAM)wParam
|
||||||
));
|
));
|
||||||
|
|
||||||
if (GetEventHandler()->ProcessEvent(vEvent))
|
if (GetEventHandler()->ProcessEvent(vEvent))
|
||||||
@@ -4113,18 +4147,18 @@ bool wxWindowOS2::HandleKeyDown(
|
|||||||
} // end of wxWindowOS2::HandleKeyDown
|
} // end of wxWindowOS2::HandleKeyDown
|
||||||
|
|
||||||
bool wxWindowOS2::HandleKeyUp(
|
bool wxWindowOS2::HandleKeyUp(
|
||||||
WXDWORD wParam
|
WXWPARAM wParam
|
||||||
, WXLPARAM lParam
|
, WXLPARAM lParam
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
int nId = wxCharCodeOS2ToWX(wParam);
|
int nId = wxCharCodeOS2ToWX((int)wParam);
|
||||||
|
|
||||||
if (!nId)
|
if (!nId)
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
// Normal ASCII char
|
// Normal ASCII char
|
||||||
//
|
//
|
||||||
nId = wParam;
|
nId = (int)wParam;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nId != -1)
|
if (nId != -1)
|
||||||
@@ -4132,6 +4166,7 @@ bool wxWindowOS2::HandleKeyUp(
|
|||||||
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
|
wxKeyEvent vEvent(CreateKeyEvent( wxEVT_KEY_UP
|
||||||
,nId
|
,nId
|
||||||
,lParam
|
,lParam
|
||||||
|
,wParam
|
||||||
));
|
));
|
||||||
|
|
||||||
if (GetEventHandler()->ProcessEvent(vEvent))
|
if (GetEventHandler()->ProcessEvent(vEvent))
|
||||||
@@ -4423,6 +4458,7 @@ int wxCharCodeOS2ToWX(
|
|||||||
case VK_PRINTSCRN: nId = WXK_PRINT; break;
|
case VK_PRINTSCRN: nId = WXK_PRINT; break;
|
||||||
case VK_INSERT: nId = WXK_INSERT; break;
|
case VK_INSERT: nId = WXK_INSERT; break;
|
||||||
case VK_DELETE: nId = WXK_DELETE; break;
|
case VK_DELETE: nId = WXK_DELETE; break;
|
||||||
|
case VK_CAPSLOCK: nId = WXK_CAPITAL; break;
|
||||||
case VK_F1: nId = WXK_F1; break;
|
case VK_F1: nId = WXK_F1; break;
|
||||||
case VK_F2: nId = WXK_F2; break;
|
case VK_F2: nId = WXK_F2; break;
|
||||||
case VK_F3: nId = WXK_F3; break;
|
case VK_F3: nId = WXK_F3; break;
|
||||||
@@ -4447,6 +4483,17 @@ int wxCharCodeOS2ToWX(
|
|||||||
case VK_F22: nId = WXK_F22; break;
|
case VK_F22: nId = WXK_F22; break;
|
||||||
case VK_F23: nId = WXK_F23; break;
|
case VK_F23: nId = WXK_F23; break;
|
||||||
case VK_F24: nId = WXK_F24; break;
|
case VK_F24: nId = WXK_F24; break;
|
||||||
|
case VK_OEM_1: nId = ';'; break;
|
||||||
|
case VK_OEM_PLUS: nId = '+'; break;
|
||||||
|
case VK_OEM_COMMA: nId = ','; break;
|
||||||
|
case VK_OEM_MINUS: nId = '-'; break;
|
||||||
|
case VK_OEM_PERIOD: nId = '.'; break;
|
||||||
|
case VK_OEM_2: nId = '/'; break;
|
||||||
|
case VK_OEM_3: nId = '~'; break;
|
||||||
|
case VK_OEM_4: nId = '['; break;
|
||||||
|
case VK_OEM_5: nId = '\\'; break;
|
||||||
|
case VK_OEM_6: nId = ']'; break;
|
||||||
|
case VK_OEM_7: nId = '\''; break;
|
||||||
case VK_NUMLOCK: nId = WXK_NUMLOCK; break;
|
case VK_NUMLOCK: nId = WXK_NUMLOCK; break;
|
||||||
case VK_SCRLLOCK: nId = WXK_SCROLL; break;
|
case VK_SCRLLOCK: nId = WXK_SCROLL; break;
|
||||||
default:
|
default:
|
||||||
|
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
|
|||||||
CODE LOADONCALL
|
CODE LOADONCALL
|
||||||
|
|
||||||
EXPORTS
|
EXPORTS
|
||||||
;From library: H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
|
;From library: H:\Dev\Wx2\WxWindows\lib\wx.lib
|
||||||
;From object file: dummy.cpp
|
;From object file: dummy.cpp
|
||||||
;PUBDEFs (Symbols available from object file):
|
;PUBDEFs (Symbols available from object file):
|
||||||
wxDummyChar
|
wxDummyChar
|
||||||
@@ -2222,12 +2222,12 @@ EXPORTS
|
|||||||
PrependDir__10wxFileNameFRC8wxString
|
PrependDir__10wxFileNameFRC8wxString
|
||||||
;wxFileName::GetPathSeparators(wxPathFormat)
|
;wxFileName::GetPathSeparators(wxPathFormat)
|
||||||
GetPathSeparators__10wxFileNameF12wxPathFormat
|
GetPathSeparators__10wxFileNameF12wxPathFormat
|
||||||
;wxFileName::Mkdir(const wxString&,int,unsigned long)
|
|
||||||
Mkdir__10wxFileNameFRC8wxStringiUl
|
|
||||||
;wxFileName::IsPathSeparator(char,wxPathFormat)
|
;wxFileName::IsPathSeparator(char,wxPathFormat)
|
||||||
IsPathSeparator__10wxFileNameFc12wxPathFormat
|
IsPathSeparator__10wxFileNameFc12wxPathFormat
|
||||||
;wxFileName::GetFullPath(wxPathFormat) const
|
;wxFileName::GetFullPath(wxPathFormat) const
|
||||||
GetFullPath__10wxFileNameCF12wxPathFormat
|
GetFullPath__10wxFileNameCF12wxPathFormat
|
||||||
|
;wxFileName::Mkdir(const wxString&,int,int)
|
||||||
|
Mkdir__10wxFileNameFRC8wxStringiT2
|
||||||
;wxFileName::Touch()
|
;wxFileName::Touch()
|
||||||
Touch__10wxFileNameFv
|
Touch__10wxFileNameFv
|
||||||
;wxFileName::FileName(const wxString&)
|
;wxFileName::FileName(const wxString&)
|
||||||
@@ -2248,8 +2248,6 @@ EXPORTS
|
|||||||
IsAbsolute__10wxFileNameCF12wxPathFormat
|
IsAbsolute__10wxFileNameCF12wxPathFormat
|
||||||
;wxFileName::GetVolumeSeparator(wxPathFormat)
|
;wxFileName::GetVolumeSeparator(wxPathFormat)
|
||||||
GetVolumeSeparator__10wxFileNameF12wxPathFormat
|
GetVolumeSeparator__10wxFileNameF12wxPathFormat
|
||||||
;wxFileName::GetPath(unsigned long,wxPathFormat) const
|
|
||||||
GetPath__10wxFileNameCFUl12wxPathFormat
|
|
||||||
;wxFileName::RemoveDir(int)
|
;wxFileName::RemoveDir(int)
|
||||||
RemoveDir__10wxFileNameFi
|
RemoveDir__10wxFileNameFi
|
||||||
;wxFileName::wxPathExists()
|
;wxFileName::wxPathExists()
|
||||||
@@ -2266,12 +2264,12 @@ EXPORTS
|
|||||||
SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
|
SplitPath__10wxFileNameFRC8wxStringP8wxStringN3212wxPathFormat
|
||||||
;wxFileName::Normalize(int,const wxString&,wxPathFormat)
|
;wxFileName::Normalize(int,const wxString&,wxPathFormat)
|
||||||
Normalize__10wxFileNameFiRC8wxString12wxPathFormat
|
Normalize__10wxFileNameFiRC8wxString12wxPathFormat
|
||||||
;wxFileName::Mkdir(int,unsigned long)
|
|
||||||
Mkdir__10wxFileNameFiUl
|
|
||||||
;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
|
;wxFileName::MakeRelativeTo(const wxString&,wxPathFormat)
|
||||||
MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
|
MakeRelativeTo__10wxFileNameFRC8wxString12wxPathFormat
|
||||||
;wxFileName::AssignDir(const wxString&,wxPathFormat)
|
;wxFileName::AssignDir(const wxString&,wxPathFormat)
|
||||||
AssignDir__10wxFileNameFRC8wxString12wxPathFormat
|
AssignDir__10wxFileNameFRC8wxString12wxPathFormat
|
||||||
|
;wxFileName::Mkdir(int,int)
|
||||||
|
Mkdir__10wxFileNameFiT1
|
||||||
;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
|
;wxFileName::SetTimes(const wxDateTime*,const wxDateTime*,const wxDateTime*)
|
||||||
SetTimes__10wxFileNameFPC10wxDateTimeN21
|
SetTimes__10wxFileNameFPC10wxDateTimeN21
|
||||||
;wxFileName::Rmdir()
|
;wxFileName::Rmdir()
|
||||||
@@ -2288,6 +2286,8 @@ EXPORTS
|
|||||||
SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
|
SplitPath__10wxFileNameFRC8wxStringP8wxStringN2212wxPathFormat
|
||||||
;wxFileName::IsCaseSensitive(wxPathFormat)
|
;wxFileName::IsCaseSensitive(wxPathFormat)
|
||||||
IsCaseSensitive__10wxFileNameF12wxPathFormat
|
IsCaseSensitive__10wxFileNameF12wxPathFormat
|
||||||
|
;wxFileName::GetPath(int,wxPathFormat) const
|
||||||
|
GetPath__10wxFileNameCFi12wxPathFormat
|
||||||
;wxFileName::GetFormat(wxPathFormat)
|
;wxFileName::GetFormat(wxPathFormat)
|
||||||
GetFormat__10wxFileNameF12wxPathFormat
|
GetFormat__10wxFileNameF12wxPathFormat
|
||||||
;wxFileName::Assign(const wxFileName&)
|
;wxFileName::Assign(const wxFileName&)
|
||||||
@@ -2426,6 +2426,12 @@ EXPORTS
|
|||||||
GetEncodingName__12wxFontMapperF14wxFontEncoding
|
GetEncodingName__12wxFontMapperF14wxFontEncoding
|
||||||
;wxFontMapper::~wxFontMapper()
|
;wxFontMapper::~wxFontMapper()
|
||||||
__dt__12wxFontMapperFv
|
__dt__12wxFontMapperFv
|
||||||
|
;wxFontMapper::sm_instance
|
||||||
|
sm_instance__12wxFontMapper
|
||||||
|
;wxFontMapper::Set(wxFontMapper*)
|
||||||
|
Set__12wxFontMapperFP12wxFontMapper
|
||||||
|
;wxFontMapper::Get()
|
||||||
|
Get__12wxFontMapperFv
|
||||||
;wxFontMapper::GetDefaultConfigPath()
|
;wxFontMapper::GetDefaultConfigPath()
|
||||||
GetDefaultConfigPath__12wxFontMapperFv
|
GetDefaultConfigPath__12wxFontMapperFv
|
||||||
;wxFontMapper::GetEncodingDescription(wxFontEncoding)
|
;wxFontMapper::GetEncodingDescription(wxFontEncoding)
|
||||||
@@ -3241,12 +3247,8 @@ EXPORTS
|
|||||||
HasOption__7wxImageCFRC8wxString
|
HasOption__7wxImageCFRC8wxString
|
||||||
;From object file: ..\common\imagfill.cpp
|
;From object file: ..\common\imagfill.cpp
|
||||||
;PUBDEFs (Symbols available from object file):
|
;PUBDEFs (Symbols available from object file):
|
||||||
;wxImage::MatchBoundaryPixel(int,int,int,int,const wxColour&,const wxColour&)
|
;wxDoFloodFill(wxDC*,int,int,const wxColour&,int)
|
||||||
MatchBoundaryPixel__7wxImageFiN31RC8wxColourT5
|
wxDoFloodFill__FP4wxDCiT2RC8wxColourT2
|
||||||
;wxImage::DoFloodFill(int,int,const wxBrush&,const wxColour&,int,int)
|
|
||||||
DoFloodFill__7wxImageFiT1RC7wxBrushRC8wxColourN21
|
|
||||||
;wxImage::MatchPixel(int,int,int,int,const wxColour&)
|
|
||||||
MatchPixel__7wxImageFiN31RC8wxColour
|
|
||||||
;From object file: ..\common\imaggif.cpp
|
;From object file: ..\common\imaggif.cpp
|
||||||
;PUBDEFs (Symbols available from object file):
|
;PUBDEFs (Symbols available from object file):
|
||||||
;wxGIFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
|
;wxGIFHandler::SaveFile(wxImage*,wxOutputStream&,unsigned long)
|
||||||
@@ -5818,6 +5820,8 @@ EXPORTS
|
|||||||
SaveFile__14wxTextCtrlBaseFRC8wxString
|
SaveFile__14wxTextCtrlBaseFRC8wxString
|
||||||
;wxTextCtrlBase::operator<<(const char)
|
;wxTextCtrlBase::operator<<(const char)
|
||||||
__ls__14wxTextCtrlBaseFCc
|
__ls__14wxTextCtrlBaseFCc
|
||||||
|
;wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent&)
|
||||||
|
EmulateKeyPress__14wxTextCtrlBaseFRC10wxKeyEvent
|
||||||
__vft14wxTextCtrlBase8wxObject
|
__vft14wxTextCtrlBase8wxObject
|
||||||
;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
|
;wxTextAttr::Combine(const wxTextAttr&,const wxTextAttr&,const wxTextCtrlBase*)
|
||||||
Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase
|
Combine__10wxTextAttrFRC10wxTextAttrT1PC14wxTextCtrlBase
|
||||||
@@ -7634,6 +7638,8 @@ EXPORTS
|
|||||||
;wxGenericDirDialog::OnNew(wxCommandEvent&)
|
;wxGenericDirDialog::OnNew(wxCommandEvent&)
|
||||||
OnNew__18wxGenericDirDialogFR14wxCommandEvent
|
OnNew__18wxGenericDirDialogFR14wxCommandEvent
|
||||||
__vft18wxGenericDirDialog8wxObject
|
__vft18wxGenericDirDialog8wxObject
|
||||||
|
;wxGenericDirDialog::OnGoHome(wxCommandEvent&)
|
||||||
|
OnGoHome__18wxGenericDirDialogFR14wxCommandEvent
|
||||||
;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
|
;wxGenericDirDialog::wxGenericDirDialog(wxWindow*,const wxString&,const wxString&,long,const wxPoint&,const wxSize&,const wxString&)
|
||||||
__ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
|
__ct__18wxGenericDirDialogFP8wxWindowRC8wxStringT2lRC7wxPointRC6wxSizeT2
|
||||||
;wxGenericDirDialog::ShowModal()
|
;wxGenericDirDialog::ShowModal()
|
||||||
@@ -14809,10 +14815,6 @@ EXPORTS
|
|||||||
OS2DestroyWindow__8wxWindowFv
|
OS2DestroyWindow__8wxWindowFv
|
||||||
;wxWindow::IsMouseInWindow() const
|
;wxWindow::IsMouseInWindow() const
|
||||||
IsMouseInWindow__8wxWindowCFv
|
IsMouseInWindow__8wxWindowCFv
|
||||||
;wxWindow::HandleKeyUp(unsigned long,void*)
|
|
||||||
HandleKeyUp__8wxWindowFUlPv
|
|
||||||
;wxWindow::HandleKeyDown(unsigned short,void*)
|
|
||||||
HandleKeyDown__8wxWindowFUsPv
|
|
||||||
;wxWindow::Clear()
|
;wxWindow::Clear()
|
||||||
Clear__8wxWindowFv
|
Clear__8wxWindowFv
|
||||||
;wxRemoveHandleAssociation(wxWindow*)
|
;wxRemoveHandleAssociation(wxWindow*)
|
||||||
@@ -14822,6 +14824,8 @@ EXPORTS
|
|||||||
Reparent__8wxWindowFP8wxWindow
|
Reparent__8wxWindowFP8wxWindow
|
||||||
;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
|
;wxWindow::OS2GetCreateWindowCoords(const wxPoint&,const wxSize&,int&,int&,int&,int&) const
|
||||||
OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
|
OS2GetCreateWindowCoords__8wxWindowCFRC7wxPointRC6wxSizeRiN33
|
||||||
|
;wxWindow::CreateKeyEvent(int,int,void*,void*) const
|
||||||
|
CreateKeyEvent__8wxWindowCFiT1PvT3
|
||||||
;wxWindow::Enable(unsigned long)
|
;wxWindow::Enable(unsigned long)
|
||||||
Enable__8wxWindowFUl
|
Enable__8wxWindowFUl
|
||||||
wxWinHandleList
|
wxWinHandleList
|
||||||
@@ -14911,6 +14915,8 @@ EXPORTS
|
|||||||
HandleMove__8wxWindowFiT1
|
HandleMove__8wxWindowFiT1
|
||||||
;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
|
;wxWindow::HandleMouseEvent(unsigned int,int,int,unsigned int)
|
||||||
HandleMouseEvent__8wxWindowFUiiT2T1
|
HandleMouseEvent__8wxWindowFUiiT2T1
|
||||||
|
;wxWindow::HandleKeyDown(void*,void*)
|
||||||
|
HandleKeyDown__8wxWindowFPvT1
|
||||||
;wxWindow::GetScrollRange(int) const
|
;wxWindow::GetScrollRange(int) const
|
||||||
GetScrollRange__8wxWindowCFi
|
GetScrollRange__8wxWindowCFi
|
||||||
;wxWindow::DoSetSize(int,int,int,int,int)
|
;wxWindow::DoSetSize(int,int,int,int,int)
|
||||||
@@ -14943,8 +14949,6 @@ EXPORTS
|
|||||||
GetTitle__8wxWindowCFv
|
GetTitle__8wxWindowCFv
|
||||||
;wxWindow::GetCharHeight() const
|
;wxWindow::GetCharHeight() const
|
||||||
GetCharHeight__8wxWindowCFv
|
GetCharHeight__8wxWindowCFv
|
||||||
;wxWindow::CreateKeyEvent(int,int,void*) const
|
|
||||||
CreateKeyEvent__8wxWindowCFiT1Pv
|
|
||||||
;wxWindow::OS2Command(unsigned int,unsigned short)
|
;wxWindow::OS2Command(unsigned int,unsigned short)
|
||||||
OS2Command__8wxWindowFUiUs
|
OS2Command__8wxWindowFUiUs
|
||||||
wxWndProc
|
wxWndProc
|
||||||
@@ -14965,6 +14969,8 @@ EXPORTS
|
|||||||
HandleActivate__8wxWindowFiUl
|
HandleActivate__8wxWindowFiUl
|
||||||
;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
|
;wxWindow::FindItemByHWND(unsigned long,unsigned long) const
|
||||||
FindItemByHWND__8wxWindowCFUlT1
|
FindItemByHWND__8wxWindowCFUlT1
|
||||||
|
;wxWindow::HandleKeyUp(void*,void*)
|
||||||
|
HandleKeyUp__8wxWindowFPvT1
|
||||||
;wxWindow::HandleChar(unsigned long,void*,unsigned long)
|
;wxWindow::HandleChar(unsigned long,void*,unsigned long)
|
||||||
HandleChar__8wxWindowFUlPvT1
|
HandleChar__8wxWindowFUlPvT1
|
||||||
;wxWindow::DoMoveWindow(int,int,int,int)
|
;wxWindow::DoMoveWindow(int,int,int,int)
|
||||||
|
Reference in New Issue
Block a user