Fix xrWeatherEditor compilation and compiler warnings

OpenXRay · Feb 3, 2018 · 28671b2 · 28671b2
1 parent 67d3bcf
commit 28671b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/editors/xrWeatherEditor/entry_point.cpp b/src/editors/xrWeatherEditor/entry_point.cpp
@@ -34,7 +34,7 @@ private ref class window_ide_final : public editor::window_ide
     {
         LONG_PTR result;
 #ifdef XR_X64
-        if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt64(), m.LParam.ToInt64(), result))
+        if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt64(), m.Msg, m.WParam.ToInt64(), m.LParam.ToInt64(), result))
             return;
 #else
         if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt32(), m.LParam.ToInt32(), result))

diff --git a/src/editors/xrWeatherEditor/window_ide.h b/src/editors/xrWeatherEditor/window_ide.h
@@ -69,8 +69,7 @@ public ref class window_ide : public System::Windows::Forms::Form
         }
     }
 
-protected:
-private: WeifenLuo::WinFormsUI::Docking::DockPanel ^ EditorDock;
+private: WeifenLuo::WinFormsUI::Docking::DockPanel^ EditorDock;
 
 private:
     /// <summary>

diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj
@@ -141,7 +141,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=3.0.3.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481">
+    <Reference Include="WeifenLuo.WinFormsUI.Docking">
       <HintPath>..\..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
     </Reference>
   </ItemGroup>