github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

fix LONG_PTR

Browse source
This commit is contained in:
lsv 2024-02-06 09:05:59 +05:00
parent 2d7ac600c0
commit 9f3cfacf96
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ctl/ctlSQLBox.cpp
View file

@ -1646,7 +1646,7 @@ CharacterRange ctlSQLBox::RegexFindText(int minPos, int maxPos, const wxString &
ft.lpstrText = (char *)(const char *)buf;
//
if (SendMsg(2150, wxSTC_FIND_REGEXP, (LONG_PTR)&ft) == -1)
if (SendMsg(2150, wxSTC_FIND_REGEXP, (std::uintptr_t)&ft) == -1)
{
ft.chrgText.cpMin = -1;
ft.chrgText.cpMax = -1;

22
ogl/composit.cpp
View file

@ -334,7 +334,7 @@ void wxCompositeShape::Copy(wxShape &copy)
wxCompositeShape &compositeCopy = (wxCompositeShape &) copy;
// Associate old and new copies for compositeCopying constraints and division geometry
oglObjectCopyMapping.Append((LONG_PTR)this, &compositeCopy);
oglObjectCopyMapping.Append((std::uintptr_t)this, &compositeCopy);
// Copy the children
wxNode *node = m_children.GetFirst();
@ -352,7 +352,7 @@ void wxCompositeShape::Copy(wxShape &copy)
if (m_divisions.Member(object))
compositeCopy.m_divisions.Append(newObject);
oglObjectCopyMapping.Append((LONG_PTR)object, newObject);
oglObjectCopyMapping.Append((std::uintptr_t)object, newObject);
node = node->GetNext();
}
@ -363,14 +363,14 @@ void wxCompositeShape::Copy(wxShape &copy)
{
wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
wxShape *newConstraining = (wxShape *)(oglObjectCopyMapping.Find((LONG_PTR)constraint->m_constrainingObject)->GetData());
wxShape *newConstraining = (wxShape *)(oglObjectCopyMapping.Find((std::uintptr_t)constraint->m_constrainingObject)->GetData());
wxList newConstrainedList;
wxNode *node2 = constraint->m_constrainedObjects.GetFirst();
while (node2)
{
wxShape *constrainedObject = (wxShape *)node2->GetData();
wxShape *newConstrained = (wxShape *)(oglObjectCopyMapping.Find((LONG_PTR)constrainedObject)->GetData());
wxShape *newConstrained = (wxShape *)(oglObjectCopyMapping.Find((std::uintptr_t)constrainedObject)->GetData());
newConstrainedList.Append(newConstrained);
node2 = node2->GetNext();
}
@ -393,19 +393,19 @@ void wxCompositeShape::Copy(wxShape &copy)
while (node)
{
wxDivisionShape *division = (wxDivisionShape *)node->GetData();
wxNode *node1 = oglObjectCopyMapping.Find((LONG_PTR)division);
wxNode *node1 = oglObjectCopyMapping.Find((std::uintptr_t)division);
wxNode *leftNode = NULL;
wxNode *topNode = NULL;
wxNode *rightNode = NULL;
wxNode *bottomNode = NULL;
if (division->GetLeftSide())
leftNode = oglObjectCopyMapping.Find((LONG_PTR)division->GetLeftSide());
leftNode = oglObjectCopyMapping.Find((std::uintptr_t)division->GetLeftSide());
if (division->GetTopSide())
topNode = oglObjectCopyMapping.Find((LONG_PTR)division->GetTopSide());
topNode = oglObjectCopyMapping.Find((std::uintptr_t)division->GetTopSide());
if (division->GetRightSide())
rightNode = oglObjectCopyMapping.Find((LONG_PTR)division->GetRightSide());
rightNode = oglObjectCopyMapping.Find((std::uintptr_t)division->GetRightSide());
if (division->GetBottomSide())
bottomNode = oglObjectCopyMapping.Find((LONG_PTR)division->GetBottomSide());
bottomNode = oglObjectCopyMapping.Find((std::uintptr_t)division->GetBottomSide());
if (node1)
{
wxDivisionShape *newDivision = (wxDivisionShape *)node1->GetData();
@ -1728,8 +1728,8 @@ void wxDivisionShape::PopupMenu(double x, double y)
wxClientDC dc(GetCanvas());
GetCanvas()->PrepareDC(dc);
int mouse_x = (int)(dc.LogicalToDeviceX((LONG_PTR)(x - x1 * unit_x)));
int mouse_y = (int)(dc.LogicalToDeviceY((LONG_PTR)(y - y1 * unit_y)));
int mouse_x = (int)(dc.LogicalToDeviceX((std::uintptr_t)(x - x1 * unit_x)));
int mouse_y = (int)(dc.LogicalToDeviceY((std::uintptr_t)(y - y1 * unit_y)));
m_canvas->PopupMenu(oglPopupDivisionMenu, mouse_x, mouse_y);
delete oglPopupDivisionMenu;