signned/unsigned fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -608,7 +608,7 @@ class WXDLLEXPORT wxMouseEvent : public wxEvent
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
wxMouseEvent& operator=(const wxMouseEvent& event);
|
wxMouseEvent& operator=(const wxMouseEvent& event);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
|
wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
|
||||||
wxMouseEvent(const wxMouseEvent& event) : wxEvent(event)
|
wxMouseEvent(const wxMouseEvent& event) : wxEvent(event)
|
||||||
@@ -742,7 +742,7 @@ public:
|
|||||||
int GetLinesPerAction() const { return m_linesPerAction; }
|
int GetLinesPerAction() const { return m_linesPerAction; }
|
||||||
|
|
||||||
// Is the system set to do page scrolling?
|
// Is the system set to do page scrolling?
|
||||||
bool IsPageScroll() const { return m_linesPerAction == UINT_MAX; }
|
bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
|
||||||
|
|
||||||
virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }
|
virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }
|
||||||
|
|
||||||
@@ -822,9 +822,9 @@ public:
|
|||||||
{
|
{
|
||||||
m_x = evt.m_x;
|
m_x = evt.m_x;
|
||||||
m_y = evt.m_y;
|
m_y = evt.m_y;
|
||||||
|
|
||||||
m_keyCode = evt.m_keyCode;
|
m_keyCode = evt.m_keyCode;
|
||||||
|
|
||||||
m_controlDown = evt.m_controlDown;
|
m_controlDown = evt.m_controlDown;
|
||||||
m_shiftDown = evt.m_shiftDown;
|
m_shiftDown = evt.m_shiftDown;
|
||||||
m_altDown = evt.m_altDown;
|
m_altDown = evt.m_altDown;
|
||||||
@@ -833,7 +833,7 @@ public:
|
|||||||
m_rawCode = evt.m_rawCode;
|
m_rawCode = evt.m_rawCode;
|
||||||
m_rawFlags = evt.m_rawFlags;
|
m_rawFlags = evt.m_rawFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Find state of shift/control keys
|
// Find state of shift/control keys
|
||||||
bool ControlDown() const { return m_controlDown; }
|
bool ControlDown() const { return m_controlDown; }
|
||||||
@@ -942,7 +942,7 @@ public:
|
|||||||
: wxEvent(event),
|
: wxEvent(event),
|
||||||
m_size(event.m_size)
|
m_size(event.m_size)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
wxSize GetSize() const { return m_size; }
|
wxSize GetSize() const { return m_size; }
|
||||||
|
|
||||||
virtual wxEvent *Clone() const { return new wxSizeEvent(*this); }
|
virtual wxEvent *Clone() const { return new wxSizeEvent(*this); }
|
||||||
@@ -974,7 +974,7 @@ public:
|
|||||||
: wxEvent(event),
|
: wxEvent(event),
|
||||||
m_pos(event.m_pos)
|
m_pos(event.m_pos)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
wxPoint GetPosition() const { return m_pos; }
|
wxPoint GetPosition() const { return m_pos; }
|
||||||
|
|
||||||
virtual wxEvent *Clone() const { return new wxMoveEvent(*this); }
|
virtual wxEvent *Clone() const { return new wxMoveEvent(*this); }
|
||||||
@@ -1131,7 +1131,7 @@ public:
|
|||||||
wxActivateEvent(const wxActivateEvent& event)
|
wxActivateEvent(const wxActivateEvent& event)
|
||||||
: wxEvent(event)
|
: wxEvent(event)
|
||||||
{ m_active = event.m_active; }
|
{ m_active = event.m_active; }
|
||||||
|
|
||||||
bool GetActive() const { return m_active; }
|
bool GetActive() const { return m_active; }
|
||||||
|
|
||||||
virtual wxEvent *Clone() const { return new wxActivateEvent(*this); }
|
virtual wxEvent *Clone() const { return new wxActivateEvent(*this); }
|
||||||
@@ -1177,7 +1177,7 @@ public:
|
|||||||
wxMenuEvent(const wxMenuEvent & event)
|
wxMenuEvent(const wxMenuEvent & event)
|
||||||
: wxEvent(event)
|
: wxEvent(event)
|
||||||
{ m_menuId = event.m_menuId; }
|
{ m_menuId = event.m_menuId; }
|
||||||
|
|
||||||
// only for wxEVT_MENU_HIGHLIGHT
|
// only for wxEVT_MENU_HIGHLIGHT
|
||||||
int GetMenuId() const { return m_menuId; }
|
int GetMenuId() const { return m_menuId; }
|
||||||
|
|
||||||
@@ -1222,7 +1222,7 @@ public:
|
|||||||
m_force = event.m_force;
|
m_force = event.m_force;
|
||||||
#endif // WXWIN_COMPATIBILITY
|
#endif // WXWIN_COMPATIBILITY
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
|
void SetLoggingOff(bool logOff) { m_loggingOff = logOff; }
|
||||||
bool GetLoggingOff() const { return m_loggingOff; }
|
bool GetLoggingOff() const { return m_loggingOff; }
|
||||||
|
|
||||||
@@ -1275,7 +1275,7 @@ public:
|
|||||||
wxShowEvent(const wxShowEvent & event)
|
wxShowEvent(const wxShowEvent & event)
|
||||||
: wxEvent(event)
|
: wxEvent(event)
|
||||||
{ m_show = event.m_show; }
|
{ m_show = event.m_show; }
|
||||||
|
|
||||||
void SetShow(bool show) { m_show = show; }
|
void SetShow(bool show) { m_show = show; }
|
||||||
bool GetShow() const { return m_show; }
|
bool GetShow() const { return m_show; }
|
||||||
|
|
||||||
@@ -1301,7 +1301,7 @@ public:
|
|||||||
wxIconizeEvent(const wxIconizeEvent & event)
|
wxIconizeEvent(const wxIconizeEvent & event)
|
||||||
: wxEvent(event)
|
: wxEvent(event)
|
||||||
{ m_iconized = event.m_iconized; }
|
{ m_iconized = event.m_iconized; }
|
||||||
|
|
||||||
// return true if the frame was iconized, false if restored
|
// return true if the frame was iconized, false if restored
|
||||||
bool Iconized() const { return m_iconized; }
|
bool Iconized() const { return m_iconized; }
|
||||||
|
|
||||||
@@ -1384,7 +1384,7 @@ public:
|
|||||||
m_buttonState(event.m_buttonState),
|
m_buttonState(event.m_buttonState),
|
||||||
m_joyStick(event.m_joyStick)
|
m_joyStick(event.m_joyStick)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
wxPoint GetPosition() const { return m_pos; }
|
wxPoint GetPosition() const { return m_pos; }
|
||||||
int GetZPosition() const { return m_zPosition; }
|
int GetZPosition() const { return m_zPosition; }
|
||||||
int GetButtonState() const { return m_buttonState; }
|
int GetButtonState() const { return m_buttonState; }
|
||||||
@@ -1507,7 +1507,7 @@ public:
|
|||||||
m_setChecked(event.m_setChecked),
|
m_setChecked(event.m_setChecked),
|
||||||
m_text(event.m_text)
|
m_text(event.m_text)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
bool GetChecked() const { return m_checked; }
|
bool GetChecked() const { return m_checked; }
|
||||||
bool GetEnabled() const { return m_enabled; }
|
bool GetEnabled() const { return m_enabled; }
|
||||||
wxString GetText() const { return m_text; }
|
wxString GetText() const { return m_text; }
|
||||||
@@ -1646,7 +1646,7 @@ public:
|
|||||||
: wxEvent(event),
|
: wxEvent(event),
|
||||||
m_paletteRealized(event.m_paletteRealized)
|
m_paletteRealized(event.m_paletteRealized)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
// App sets this if it changes the palette.
|
// App sets this if it changes the palette.
|
||||||
void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
|
void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
|
||||||
bool GetPaletteRealized() const { return m_paletteRealized; }
|
bool GetPaletteRealized() const { return m_paletteRealized; }
|
||||||
@@ -1783,7 +1783,7 @@ public:
|
|||||||
m_target(event.m_target),
|
m_target(event.m_target),
|
||||||
m_link(event.m_link)
|
m_link(event.m_link)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
// Position of event (in screen coordinates)
|
// Position of event (in screen coordinates)
|
||||||
const wxPoint& GetPosition() const { return m_pos; }
|
const wxPoint& GetPosition() const { return m_pos; }
|
||||||
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
||||||
@@ -1828,7 +1828,7 @@ public:
|
|||||||
: wxCommandEvent(event),
|
: wxCommandEvent(event),
|
||||||
m_pos(event.m_pos)
|
m_pos(event.m_pos)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
// Position of event (in screen coordinates)
|
// Position of event (in screen coordinates)
|
||||||
const wxPoint& GetPosition() const { return m_pos; }
|
const wxPoint& GetPosition() const { return m_pos; }
|
||||||
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
||||||
@@ -1858,7 +1858,7 @@ public:
|
|||||||
: wxEvent(event),
|
: wxEvent(event),
|
||||||
m_requestMore(event.m_requestMore)
|
m_requestMore(event.m_requestMore)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
|
void RequestMore(bool needMore = TRUE) { m_requestMore = needMore; }
|
||||||
bool MoreRequested() const { return m_requestMore; }
|
bool MoreRequested() const { return m_requestMore; }
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user