Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More OS/2 updates reflecting changes in 24 Branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2003-04-17 15:47:35 +00:00
parent 9dff851556
commit 6e348b12dc
11 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/os2/spinctrl.h
View File

@@ -115,6 +115,7 @@ protected:
//
void OnSpinChange(wxSpinEvent& rEvent);
void OnChar(wxKeyEvent& rEvent);
void OnSetFocus(wxFocusEvent& rEvent);
WXHWND m_hWndBuddy;
static wxArraySpins m_svAllSpins;

4
src/os2/cursor.cpp
View File

@@ -310,6 +310,10 @@ wxCursor::wxCursor(
);
break;
}
//
// No need to destroy the stock cursors
//
((wxCursorRefData *)m_refData)->m_bDestroyCursor = FALSE;
} // end of wxCursor::wxCursor
// Global cursor setting

4
src/os2/makefile.va
View File

@@ -1163,9 +1163,9 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
rd ..\common\$D
rd ..\html\$D
rd ..\os2\$D
del $(LIBTARGET)
del ..\lib\wx.lib
!if "$(WXMAKINGDLL)" == "1"
erase /N ..\..\lib\wx25.lib
del ..\lib\wx25.lib
!endif
cleanall: clean

8
src/os2/radiobut.cpp
View File

@@ -228,7 +228,12 @@ void wxRadioButton::SetValue(
wxCHECK_RET(pNodeThis, _T("radio button not a child of its parent?"));
//
// Turn off all radio buttons before this one
// If it's not the first item of the group ...
//
if ( !HasFlag(wxRB_GROUP) )
{
//
// ...turn off all radio buttons before this one
//
for ( wxWindowList::Node* pNodeBefore = pNodeThis->GetPrevious();
pNodeBefore;
@@ -255,6 +260,7 @@ void wxRadioButton::SetValue(
break;
}
}
}
//
// ... and all after this one

1
src/os2/scrolbar.cpp
View File

@@ -226,6 +226,7 @@ bool wxScrollBar::OS2OnScroll (
,m_windowId
);
vEvent.SetOrientation(IsVertical() ? wxVERTICAL : wxHORIZONTAL);
vEvent.SetPosition(nPosition);
vEvent.SetEventObject(this);
return GetEventHandler()->ProcessEvent(vEvent);

14
src/os2/spinctrl.cpp
View File

@@ -49,7 +49,9 @@ wxArraySpins wxSpinCtrl::m_svAllSpins;
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
EVT_CHAR(wxSpinCtrl::OnChar)
EVT_SPIN(-1, wxSpinCtrl::OnSpinChange)
EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// constants
@@ -404,6 +406,18 @@ void wxSpinCtrl::OnSpinChange(
}
} // end of wxSpinCtrl::OnSpinChange
void wxSpinCtrl::OnSetFocus (
wxFocusEvent& rEvent
)
{
//
// When we get focus, give it to our buddy window as it needs it more than
// we do
//
::WinSetFocus(HWND_DESKTOP, (HWND)m_hWndBuddy);
rEvent.Skip();
} // end of wxSpinCtrl::OnSetFocus
bool wxSpinCtrl::ProcessTextCommand(
WXWORD wCmd
, WXWORD wId

24
src/os2/stattext.cpp
View File

@@ -121,6 +121,7 @@ wxSize wxStaticText::DoGetBestSize() const
int nHeightLineDefault = 0;
int nHeightLine = 0;
wxString sCurLine;
bool bLastWasAmpersand = FALSE;
for (const wxChar *pc = sText; ; pc++)
{
@@ -161,6 +162,29 @@ wxSize wxStaticText::DoGetBestSize() const
}
else
{
//
// We shouldn't take into account the '&' which just introduces the
// mnemonic characters and so are not shown on the screen -- except
// when it is preceded by another '&' in which case it stands for a
// literal ampersand
//
if (*pc == _T('&'))
{
if (!bLastWasAmpersand)
{
bLastWasAmpersand = TRUE;
//
// Skip the statement adding pc to curLine below
//
continue;
}
//
// It is a literal ampersand
//
bLastWasAmpersand = FALSE;
}
sCurLine += *pc;
}
}

9
src/os2/textctrl.cpp
View File

@@ -507,6 +507,15 @@ void wxTextCtrl::SetInsertionPointEnd()
{
long lPos = GetLastPosition();
//
// We must not do anything if the caret is already there because calling
// SetInsertionPoint() thaws the controls if Freeze() had been called even
// if it doesn't actually move the caret anywhere and so the simple fact of
// doing it results in horrible flicker when appending big amounts of text
// to the control in a few chunks (see DoAddText() test in the text sample)
//
if (GetInsertionPoint() == GetLastPosition())
return;
SetInsertionPoint(lPos);
} // end of wxTextCtrl::SetInsertionPointEnd

2
src/os2/toplevel.cpp
View File

@@ -801,7 +801,7 @@ void wxTopLevelWindowOS2::Maximize(
// We can't maximize the hidden frame because it shows it as well, so
// just remember that we should do it later in this case
//
m_bMaximizeOnShow = TRUE;
m_bMaximizeOnShow = bMaximize;
}
} // end of wxTopLevelWindowOS2::Maximize

4
src/os2/window.cpp
View File

@@ -3513,7 +3513,9 @@ bool wxWindowOS2::HandleCreate(
bool wxWindowOS2::HandleDestroy()
{
SendDestroyEvent();
wxWindowDestroyEvent vEvent((wxWindow*)this);
vEvent.SetId(GetId());
(void)GetEventHandler()->ProcessEvent(vEvent);
//
// Delete our drop target if we've got one

4
src/os2/wx25.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL
EXPORTS
;From library: H:\DEV\WX2\WXWINDOWS\lib\wx.lib
;From library: H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file):
wxDummyChar
@@ -13090,6 +13090,8 @@ EXPORTS
SetFocus__10wxSpinCtrlFv
;wxSpinCtrl::SetValue(const wxString&)
SetValue__10wxSpinCtrlFRC8wxString
;wxSpinCtrl::OnSetFocus(wxFocusEvent&)
OnSetFocus__10wxSpinCtrlFR12wxFocusEvent
;wxSpinCtrl::sm_classwxSpinCtrl
sm_classwxSpinCtrl__10wxSpinCtrl
;wxSpinCtrl::m_svAllSpins