AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed compile bug in dropsrc.cpp (constr. arg); GnuWin32 fix in registry.cpp;

Browse Source 
combobox event fix; moved SetAcceleratorTable down to window.h/cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1998-08-13 10:16:03 +00:00
parent 5e0394ae9b
commit 088a95f5ff
6 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/msw/combobox.cpp
View File

@ -50,6 +50,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
event.SetString(copystring(GetValue()));
event.SetEventObject(this);
ProcessCommand(event);
delete[] event.GetString();
return TRUE;

5
src/msw/frame.cpp
View File

@ -352,11 +352,6 @@ void wxFrame::SetIcon(const wxIcon& icon)
#endif
}
void wxFrame::SetAcceleratorTable(const wxAcceleratorTable& accel)
{
m_acceleratorTable = accel;
}
wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{

4
src/msw/ole/dropsrc.cpp
View File

@ -149,13 +149,13 @@ void wxDropSource::Init()
m_pIDropSource->AddRef();
}
wxDropSource::wxDropSource()
wxDropSource::wxDropSource(wxWindow* WXUNUSED(win))
{
Init();
m_pData = NULL;
}
wxDropSource::wxDropSource(wxDataObject& data)
wxDropSource::wxDropSource(wxDataObject& data, wxWindow* WXUNUSED(win))
{
Init();
SetData(data);

7
src/msw/registry.cpp
View File

@ -297,10 +297,17 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
return str;
}
#ifdef __GNUWIN32__
bool wxRegKey::GetKeyInfo(uint* pnSubKeys,
uint* pnMaxKeyLen,
uint* pnValues,
uint* pnMaxValueLen) const
#else
bool wxRegKey::GetKeyInfo(ulong *pnSubKeys,
ulong *pnMaxKeyLen,
ulong *pnValues,
ulong *pnMaxValueLen) const
#endif
{
#ifdef __WIN32__
m_dwLastError = ::RegQueryInfoKey

5
src/msw/tbar95.cpp
View File

@ -432,6 +432,11 @@ void wxToolBar95::ToggleTool(int toolIndex, bool toggle)
}
}
bool wxToolBar95::GetToolState(int toolIndex) const
{
return (::SendMessage((HWND) GetHWND(), TB_ISBUTTONCHECKED, (WPARAM)toolIndex, (LPARAM)0) != 0);
}
void wxToolBar95::ClearTools(void)
{
// TODO: Don't know how to reset the toolbar bitmap, as yet.

14
src/msw/window.cpp
View File

@ -504,6 +504,12 @@ void wxWindow::ReleaseMouse(void)
}
}
void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel)
{
m_acceleratorTable = accel;
}
// Push/pop event handler (i.e. allow a chain of event handlers
// be searched)
void wxWindow::PushEventHandler(wxEvtHandler *handler)
@ -1961,9 +1967,13 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
return FALSE;
}
bool wxWindow::MSWTranslateMessage(WXMSG* WXUNUSED(pMsg))
bool wxWindow::MSWTranslateMessage(WXMSG* pMsg)
{
return FALSE;
if (m_acceleratorTable.Ok() &&
::TranslateAccelerator((HWND) GetHWND(), (HACCEL) m_acceleratorTable.GetHACCEL(), (MSG *)pMsg))
return TRUE;
else
return FALSE;
}
long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate))