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

(blind) fixes for Motif compilation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-02-08 15:54:51 +00:00
parent 24f25c8af1
commit cce442ba7c
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/motif/icon.h
View File

@@ -57,8 +57,6 @@ public:
bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM, bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
int desiredWidth = -1, int desiredHeight = -1); int desiredWidth = -1, int desiredHeight = -1);
bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
{ return wxBitmap::LoadFile(name, type); }
inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; } inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; }

27
src/motif/window.cpp
View File

@@ -2099,22 +2099,21 @@ static void wxCanvasInputEvent(Widget drawingArea,
{ {
// I have a dclick // I have a dclick
canvas->SetLastClick(0, ts); canvas->SetLastClick(0, ts);
switch ( eventType )
wxEventType typeDouble;
if ( eventType == wxEVT_LEFT_DOWN )
typeDouble = wxEVT_LEFT_DCLICK;
else if ( eventType == wxEVT_MIDDLE_DOWN )
typeDouble = wxEVT_MIDDLE_DCLICK;
else if ( eventType == wxEVT_RIGHT_DOWN )
typeDouble = wxEVT_RIGHT_DCLICK;
else
typeDouble = wxEVT_NULL;
if ( typeDouble != wxEVT_NULL )
{ {
case wxEVT_LEFT_DOWN: wxevent.SetEventType(typeDouble);
wxevent.SetEventType(wxEVT_LEFT_DCLICK);
break;
case wxEVT_MIDDLE_DOWN:
wxevent.SetEventType(wxEVT_MIDDLE_DCLICK);
break;
case wxEVT_RIGHT_DOWN:
wxevent.SetEventType(wxEVT_RIGHT_DCLICK);
break;
default :
break;
} }
} }
else else
{ {