diff --git a/Installer/install_script.iss b/Installer/install_script.iss index 1231157..6c21901 100644 --- a/Installer/install_script.iss +++ b/Installer/install_script.iss @@ -3,7 +3,7 @@ [Setup] AppName=Blocks3D AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067} -AppVersion=v0_0_104_3 +AppVersion=v0_0_104_4 AppPublisherURL=http://blocks3d.com/ AppSupportURL=http://blocks3d.com/ AppUpdatesURL=http://blocks3d.com/ diff --git a/src/source/Application.cpp b/src/source/Application.cpp index 09a6b3d..d768ee8 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -134,7 +134,7 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance); webBrowser = new IEBrowser(_hwndToolbox); - SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)webBrowser); + SetProp(_hwndToolbox,"Browser",(HANDLE)webBrowser); navigateToolbox("http://androdome.com/res/ClientToolbox.php"); //navigateToolbox(GetFileInPath("/content/page/controller.html")); //navigateToolbox(GetFileInPath("/content/page/controller.html")); @@ -183,7 +183,7 @@ void Application::onInit() { cameraController.setFrame(Vector3(0,2,10)); _dataModel = new DataModelInstance(); _dataModel->setParent(NULL); - _dataModel->name = "undefined"; + _dataModel->setName("undefined"); _dataModel->font = g_fntdominant; g_dataModel = _dataModel; diff --git a/src/source/DataModelV2/GuiRootInstance.cpp b/src/source/DataModelV2/GuiRootInstance.cpp index d6e9d8d..61756b8 100644 --- a/src/source/DataModelV2/GuiRootInstance.cpp +++ b/src/source/DataModelV2/GuiRootInstance.cpp @@ -480,7 +480,7 @@ bool GuiRootInstance::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y) } return false; } - +//Oh eww... void GuiRootInstance::update() { Instance * obj6 = this->findFirstChild("Delete"); diff --git a/src/source/ax.cpp b/src/source/ax.cpp index bc56313..2712c50 100644 --- a/src/source/ax.cpp +++ b/src/source/ax.cpp @@ -505,7 +505,7 @@ HRESULT _stdcall AXClientSite :: Invoke( EXCEPINFO FAR* pExcepInfo, unsigned int FAR* puArgErr) { - IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA); + IEBrowser * browser = (IEBrowser *)GetProp(Window,"Browser"); return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); //return S_OK;