OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.
Sorry, I may be overwriting changes Robert made due to a file copying error. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,9 +24,7 @@
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
|
||||
#ifdef PROLOGIO
|
||||
#include <wx/wxexpr.h>
|
||||
#endif
|
||||
|
||||
#include "basic.h"
|
||||
#include "basicp.h"
|
||||
@@ -1716,7 +1714,7 @@ void wxDivisionShape::EditEdge(int side)
|
||||
// Popup menu
|
||||
void wxDivisionShape::PopupMenu(double x, double y)
|
||||
{
|
||||
oglPopupDivisionMenu->SetClientData((char *)this);
|
||||
oglPopupDivisionMenu->SetClientData((void *)this);
|
||||
if (m_leftSide)
|
||||
oglPopupDivisionMenu->Enable(DIVISION_MENU_EDIT_LEFT_EDGE, TRUE);
|
||||
else
|
||||
|
Reference in New Issue
Block a user