Merge remote-tracking branch 'upstream/master' into original

.github/workflows/windows-premake-msvc.yaml

@@ -0,0 +1,30 @@
+name: Windows-premake-msvc
+on: [push, pull_request]
+jobs:
+  Build-Guisan:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: install premake5
+      uses: Jarod42/install-premake5@v1
+
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: run premake5
+      run: premake5.exe vs2022 --to=solution/vs2022
+
+    - name: build
+      run: |
+        cd solution/vs2022
+        nuget install packages.config -OutputDirectory packages
+        msbuild.exe /property:Configuration=Release Guisan.sln
+
+    - name: artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: guisan-msvc
+        path: |
+          solution/vs2022/bin/Release/**.*

CMakeLists.txt

@@ -18,8 +18,8 @@ INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/include")
 ADD_COMPILE_DEFINITIONS(GUICHAN_BUILD GUICHAN_EXTENSION_BUILD)
 
 # The Guisan core library
-FILE(GLOB GUISAN_HEADER include/guisan.hpp)
-FILE(GLOB GUISAN_HEADERS
+SET(GUISAN_HEADER include/guisan.hpp)
+SET(GUISAN_HEADERS
   include/guisan/actionevent.hpp
   include/guisan/actionlistener.hpp
   include/guisan/cliprectangle.hpp
@@ -53,7 +53,7 @@ FILE(GLOB GUISAN_HEADERS
   include/guisan/rectangle.hpp
   include/guisan/selectionevent.hpp
   include/guisan/selectionlistener.hpp
-  include/guisan.text.hpp
+  include/guisan/text.hpp
   include/guisan/widget.hpp
   include/guisan/widgetlistener.hpp
 )
@@ -76,11 +76,11 @@ ELSE(BUILD_GUISAN_SHARED)
 ENDIF(BUILD_GUISAN_SHARED)
 
 ADD_LIBRARY(${PROJECT_NAME} ${GUISAN_LIBRARY_TYPE}
-	${GUISAN_HEADER} 
-	${GUISAN_HEADERS} 
-	${GUISAN_WIDGET_HEADERS} 
+	${GUISAN_HEADER}
+	${GUISAN_HEADERS}
+	${GUISAN_WIDGET_HEADERS}
 	${GUISAN_CONTRIB_WIDGET_HEADERS}
-	${GUISAN_SRC} 
+	${GUISAN_SRC}
 	${GUISAN_WIDGET_SRC})
 
 ADD_CUSTOM_TARGET(lib DEPENDS ${PROJECT_NAME}) # Create symlink

demo/ff/src/ffdemo.cpp

@@ -700,7 +700,7 @@ void FFDemo::input()
             {
                 Mix_PlayChannel(-1, mEscapeSound, 0);
 
-                action(gcn::ActionEvent(NULL, "escape"));
+                action(gcn::ActionEvent(nullptr, "escape"));
             }
             else if (mEvent.key.keysym.sym == SDLK_RETURN
                      || mEvent.key.keysym.sym == SDLK_UP

demo/ff/src/fflistbox.cpp

@@ -83,7 +83,7 @@ FFListBox::~FFListBox()
 
 void FFListBox::draw(gcn::Graphics* graphics)
 {
-		if (mListModel == NULL)
+		if (mListModel == nullptr)
 		{
         return;
 		}