| |
@@ -0,0 +1,115 @@
|
| |
+ diff -up 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 3Depict-0.0.22/src/gui/cropPanel.cpp
|
| |
+ --- 3Depict-0.0.22/src/gui/cropPanel.cpp.wx32 2019-01-05 19:47:51.000000000 -0500
|
| |
+ +++ 3Depict-0.0.22/src/gui/cropPanel.cpp 2022-08-04 18:48:53.245358493 -0400
|
| |
+ @@ -720,7 +720,7 @@ void CropPanel::makeCropValuesValid()
|
| |
+ void CropPanel::onResize(wxSizeEvent &evt)
|
| |
+ {
|
| |
+ #ifndef __WXMAC__
|
| |
+ - wxPaintEvent paintEvt;
|
| |
+ - wxPostEvent(this,paintEvt);
|
| |
+ + Refresh();
|
| |
+ + Update();
|
| |
+ #endif
|
| |
+ }
|
| |
+ diff -up 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp
|
| |
+ --- 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp.wx32 2018-08-05 09:48:45.000000000 -0400
|
| |
+ +++ 3Depict-0.0.22/src/gui/dialogs/resolutionDialog.cpp 2022-08-04 18:49:54.126843451 -0400
|
| |
+ @@ -79,8 +79,8 @@ END_EVENT_TABLE();
|
| |
+
|
| |
+ void ResolutionDialog::updateImage()
|
| |
+ {
|
| |
+ - wxPaintEvent paintEvt;
|
| |
+ - wxPostEvent(this,paintEvt);
|
| |
+ + Refresh();
|
| |
+ + Update();
|
| |
+ }
|
| |
+
|
| |
+ void ResolutionDialog::setRes(unsigned int w, unsigned int h, bool asReset)
|
| |
+ diff -up 3Depict-0.0.22/src/gui/glPane.cpp.wx32 3Depict-0.0.22/src/gui/glPane.cpp
|
| |
+ --- 3Depict-0.0.22/src/gui/glPane.cpp.wx32 2019-01-05 19:47:51.000000000 -0500
|
| |
+ +++ 3Depict-0.0.22/src/gui/glPane.cpp 2022-08-04 19:34:27.351248848 -0400
|
| |
+ @@ -214,8 +214,8 @@ unsigned int BasicGLPane::hoverTest(con
|
| |
+ void BasicGLPane::forceRedraw()
|
| |
+ {
|
| |
+ //Force a paint update for the scene
|
| |
+ - wxPaintEvent ptEvent;
|
| |
+ - wxPostEvent(this,ptEvent);
|
| |
+ + Refresh();
|
| |
+ + Update();
|
| |
+
|
| |
+ #ifdef WIN32
|
| |
+ //Hack for windows. Does not redraw otherwise.
|
| |
+ @@ -1108,8 +1108,8 @@ bool BasicGLPane::saveImage(unsigned int
|
| |
+ delete image;
|
| |
+
|
| |
+ if (needPostPaint) {
|
| |
+ - wxPaintEvent event;
|
| |
+ - wxPostEvent(this,event);
|
| |
+ + Refresh();
|
| |
+ + Update();
|
| |
+ }
|
| |
+
|
| |
+ return isOK;
|
| |
+ @@ -1182,8 +1182,8 @@ bool BasicGLPane::saveImageSequence(unsi
|
| |
+ currentScene->discardTempCam();
|
| |
+ wxD->Destroy();
|
| |
+
|
| |
+ - wxPaintEvent event;
|
| |
+ - wxPostEvent(this,event);
|
| |
+ + Refresh();
|
| |
+ + Update();
|
| |
+ return true;
|
| |
+
|
| |
+ }
|
| |
+ diff -up 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 3Depict-0.0.22/src/gui/mainFrame.cpp
|
| |
+ --- 3Depict-0.0.22/src/gui/mainFrame.cpp.wx32 2022-08-04 16:54:09.801980447 -0400
|
| |
+ +++ 3Depict-0.0.22/src/gui/mainFrame.cpp 2022-08-04 18:47:41.785789266 -0400
|
| |
+ @@ -1814,8 +1814,8 @@ void MainWindowFrame::OnFileExportVideo(
|
| |
+
|
| |
+
|
| |
+ //Force a paint update for the scene, to ensure aspect ratio information is preserved
|
| |
+ - wxPaintEvent ptEvent;
|
| |
+ - wxPostEvent(panelTop,ptEvent);
|
| |
+ + panelTop->Refresh();
|
| |
+ + panelTop->Update();
|
| |
+ }
|
| |
+
|
| |
+
|
| |
+ diff -up 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 3Depict-0.0.22/src/wx/propertyGridUpdater.h
|
| |
+ --- 3Depict-0.0.22/src/wx/propertyGridUpdater.h.wx32 2018-06-05 18:52:57.000000000 -0400
|
| |
+ +++ 3Depict-0.0.22/src/wx/propertyGridUpdater.h 2022-08-04 17:51:35.619683708 -0400
|
| |
+ @@ -19,7 +19,9 @@
|
| |
+ #ifndef PROPERTYGRIDUPDATER_H
|
| |
+ #define PROPERTYGRIDUPDATER_H
|
| |
+
|
| |
+ +#include <wx/bmpbndl.h>
|
| |
+ #include <wx/propgrid/propgrid.h>
|
| |
+ +#include <wx/propgrid/editors.h>
|
| |
+ #include <wx/msgdlg.h>
|
| |
+ #include "backend/filter.h"
|
| |
+ #include "gui/dialogs/transferFuncDialog.h"
|
| |
+ diff -up 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 3Depict-0.0.22/src/wx/wxcomponents.h
|
| |
+ --- 3Depict-0.0.22/src/wx/wxcomponents.h.wx32 2018-06-05 18:52:57.000000000 -0400
|
| |
+ +++ 3Depict-0.0.22/src/wx/wxcomponents.h 2022-08-04 17:57:47.144135600 -0400
|
| |
+ @@ -39,10 +39,10 @@
|
| |
+
|
| |
+ //!3D combo grid renderer, from
|
| |
+ //http://nomadsync.cvs.sourceforge.net/nomadsync/nomadsync/src/EzGrid.cpp?view=markup (GPL)
|
| |
+ -class wxGridCellChoiceRenderer : public wxGridCellStringRenderer
|
| |
+ +class wxGridCellChoiceRenderer_ : public wxGridCellStringRenderer
|
| |
+ {
|
| |
+ public:
|
| |
+ - wxGridCellChoiceRenderer(wxLayoutAlignment border = wxLAYOUT_NONE) :
|
| |
+ + wxGridCellChoiceRenderer_(wxLayoutAlignment border = wxLAYOUT_NONE) :
|
| |
+ m_border(border) {}
|
| |
+ virtual void Draw(wxGrid& grid,
|
| |
+ wxGridCellAttr& attr,
|
| |
+ @@ -52,7 +52,7 @@ public:
|
| |
+ bool isSelected);
|
| |
+ virtual wxGridCellRenderer *Clone() const
|
| |
+ {
|
| |
+ - return new wxGridCellChoiceRenderer;
|
| |
+ + return new wxGridCellChoiceRenderer_;
|
| |
+ }
|
| |
+ private:
|
| |
+ wxLayoutAlignment m_border;
|
| |
