Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Code/maxGUI/maxGUI.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <maxGUI/Button.hpp>
#include <maxGUI/CheckBox.hpp>
#include <maxGUI/DropDownBox.hpp>
#include <maxGUI/EntryPoint.hpp>
#include <maxGUI/maxGUIEntryPoint.hpp>
#include <maxGUI/FormAllocatorConcept.hpp>
#include <maxGUI/FormAllocatorModel.hpp>
#include <maxGUI/FormConcept.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include <maxGUI/EntryPoint.hpp>
#include <maxGUI/maxGUIEntryPoint.hpp>

#if defined(MAX_PLATFORM_LINUX)
#include <QApplication>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef MAXGUI_ENTRYPOINT_HPP
#define MAXGUI_ENTRYPOINT_HPP
#ifndef MAXGUI_MAXGUIENTRYPOINT_HPP
#define MAXGUI_MAXGUIENTRYPOINT_HPP

#include <max/Compiling/Configuration.hpp>
#include <maxGUI/FormContainer.hpp>
Expand Down Expand Up @@ -46,4 +46,4 @@ namespace maxGUI {

} // namespace maxGUI

#endif // #ifndef MAXGUI_ENTRYPOINT_HPP
#endif // #ifndef MAXGUI_MAXGUIENTRYPOINT_HPP
2 changes: 1 addition & 1 deletion Projects/Make/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ CXX_SRCS = \
../../Code/maxGUI/ControlImplementation.cpp \
../../Code/maxGUI/ControlWithText.cpp \
../../Code/maxGUI/ControlWithTextImplementation.cpp \
../../Code/maxGUI/EntryPoint.cpp \
../../Code/maxGUI/FormAllocatorConcept.cpp \
../../Code/maxGUI/FormConcept.cpp \
../../Code/maxGUI/FormContainer.cpp \
../../Code/maxGUI/maxGUIEntryPoint.cpp \
../../Code/maxGUI/MultilineTextBoxImplementation.cpp
#../../Code/maxGUI/CheckBoxImplementation.cpp \
#../../Code/maxGUI/ControlWithList.cpp \
Expand Down
4 changes: 2 additions & 2 deletions Projects/VisualStudio/maxGUI/maxGUI.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ClCompile Include="..\..\..\Code\maxGUI\ControlWithText.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\ControlWithTextImplementation.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\DropDownBoxImplementation.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\EntryPoint.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\FormAllocatorConcept.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\FormConcept.cpp" />
<ClCompile Include="..\..\..\Code\maxGUI\FormContainer.cpp" />
Expand All @@ -82,7 +82,7 @@
<ClInclude Include="..\..\..\Code\maxGUI\ControlWithTextImplementation.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\DropDownBoxImplementation.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\DropDownBox.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\EntryPoint.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\FormAllocatorConcept.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\FormAllocatorModel.hpp" />
<ClInclude Include="..\..\..\Code\maxGUI\FormConcept.hpp" />
Expand Down
4 changes: 2 additions & 2 deletions Projects/VisualStudio/maxGUI/maxGUI.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</Xml>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\Code\maxGUI\EntryPoint.cpp">
<ClCompile Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.cpp">
<Filter>Code</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Code\maxGUI\Control.cpp">
Expand Down Expand Up @@ -194,7 +194,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Code\maxGUI\EntryPoint.hpp">
<ClInclude Include="..\..\..\Code\maxGUI\maxGUIEntryPoint.hpp">
<Filter>Code</Filter>
</ClInclude>
<ClInclude Include="..\..\..\Code\maxGUI\Button.hpp">
Expand Down