projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unicode compilation fixes
[wxWidgets.git]
/
src
/
msw
/
control.cpp
diff --git
a/src/msw/control.cpp
b/src/msw/control.cpp
index 1bea290c7e3b6466590f4049dee98025ba9bcd7e..4ba67fba6ee48499e919f8436eaebf528daf736d 100644
(file)
--- a/
src/msw/control.cpp
+++ b/
src/msw/control.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: control.cpp
+// Name:
msw/
control.cpp
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
// Purpose: wxControl class
// Author: Julian Smart
// Modified by:
@@
-10,28
+10,30
@@
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "control.h"
+
#pragma implementation "control.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#endif
+#if wxUSE_CONTROLS
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-#include "wx/event.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
-#include "wx/log.h"
+
#include "wx/event.h"
+
#include "wx/app.h"
+
#include "wx/dcclient.h"
+
#include "wx/log.h"
#endif
#include "wx/control.h"
#include "wx/msw/private.h"
#endif
#include "wx/control.h"
#include "wx/msw/private.h"
-#if defined(__WIN95__) && !(
defined(__GNUWIN32_OLD__) || defined(__TWIN32
__))
+#if defined(__WIN95__) && !(
(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10
__))
#include <commctrl.h>
#endif
#include <commctrl.h>
#endif
@@
-160,10
+162,10
@@
bool wxControl::MSWOnNotify(int idCtrl,
WXLPARAM lParam,
WXLPARAM* result)
{
WXLPARAM lParam,
WXLPARAM* result)
{
- wxCommandEvent event(wxEVT_NULL, m_windowId);
wxEventType eventType = wxEVT_NULL;
wxEventType eventType = wxEVT_NULL;
- NMHDR *hdr1 = (NMHDR*) lParam;
- switch ( hdr1->code )
+
+ NMHDR *hdr = (NMHDR*) lParam;
+ switch ( hdr->code )
{
case NM_CLICK:
eventType = wxEVT_COMMAND_LEFT_CLICK;
{
case NM_CLICK:
eventType = wxEVT_COMMAND_LEFT_CLICK;
@@
-197,6
+199,7
@@
bool wxControl::MSWOnNotify(int idCtrl,
return wxWindow::MSWOnNotify(idCtrl, lParam, result);
}
return wxWindow::MSWOnNotify(idCtrl, lParam, result);
}
+ wxCommandEvent event(wxEVT_NULL, m_windowId);
event.SetEventType(eventType);
event.SetEventObject(this);
event.SetEventType(eventType);
event.SetEventObject(this);
@@
-223,10
+226,17
@@
void wxControl::OnEraseBackground(wxEraseEvent& event)
::SetMapMode(hdc, mode);
}
::SetMapMode(hdc, mode);
}
-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
+#if wxUSE_CTL3D
WXUINT message,
WXWPARAM wParam,
WXUINT message,
WXWPARAM wParam,
- WXLPARAM lParam)
+ WXLPARAM lParam
+#else
+ WXUINT WXUNUSED(message),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam)
+#endif
+ )
{
#if wxUSE_CTL3D
if ( m_useCtl3D )
{
#if wxUSE_CTL3D
if ( m_useCtl3D )
@@
-298,3
+308,4
@@
void wxFindMaxSize(WXHWND wnd, RECT *rect)
rect->bottom = bottom;
}
rect->bottom = bottom;
}
+#endif // wxUSE_CONTROLS