https://git.reactos.org/?p=reactos.git;a=commitdiff;h=470d86f1e5bd74c276779057cff142ef11ee031e
commit 470d86f1e5bd74c276779057cff142ef11ee031e Author: Katayama Hirofumi MZ <[email protected]> AuthorDate: Fri Nov 24 10:12:37 2023 +0900 Commit: Katayama Hirofumi MZ <[email protected]> CommitDate: Fri Nov 24 10:12:37 2023 +0900 [MSPAINT] Delete globalvar.h and move code to precomp.h Refactoring. CORE-19094 --- base/applications/mspaint/globalvar.h | 50 --------------------------------- base/applications/mspaint/precomp.h | 52 +++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h deleted file mode 100644 index e2257fbb693..00000000000 --- a/base/applications/mspaint/globalvar.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) - * PURPOSE: Declaring global variables for later initialization - * COPYRIGHT: Copyright 2015 Benedikt Freisen <[email protected]> - */ - -#pragma once - -/* VARIABLES declared in main.cpp ***********************************/ - -extern BOOL g_askBeforeEnlarging; - -extern HINSTANCE g_hinstExe; - -extern WCHAR g_szFileName[MAX_LONG_PATH]; -extern BOOL g_isAFile; -extern BOOL g_imageSaved; -extern BOOL g_showGrid; - -extern CMainWindow mainWindow; - -/* VARIABLES declared in dialogs.cpp ********************************/ - -extern CMirrorRotateDialog mirrorRotateDialog; -extern CAttributesDialog attributesDialog; -extern CStretchSkewDialog stretchSkewDialog; -extern CFontsDialog fontsDialog; - -/* VARIABLES declared in the other places ***************************/ - -extern RegistrySettings registrySettings; -extern ImageModel imageModel; -extern ToolsModel toolsModel; -extern SelectionModel selectionModel; -extern PaletteModel paletteModel; - -extern HWND g_hStatusBar; -extern float g_xDpi; -extern float g_yDpi; -extern INT g_fileSize; -extern SYSTEMTIME g_fileTime; - -extern CFullscreenWindow fullscreenWindow; -extern CMiniatureWindow miniature; -extern CToolBox toolBoxContainer; -extern CToolSettingsWindow toolSettingsWindow; -extern CPaletteWindow paletteWindow; -extern CCanvasWindow canvasWindow; -extern CTextEditWindow textEditWindow; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 8d1aaf0f608..346c7bda846 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -1,5 +1,11 @@ -#ifndef _MSPAINT_H -#define _MSPAINT_H +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: The precompiled header + * COPYRIGHT: Copyright 2015 Benedikt Freisen <[email protected]> + */ + +#pragma once #ifdef NDEBUG #undef DBG @@ -26,7 +32,7 @@ #include <shellapi.h> #include <htmlhelp.h> #include <strsafe.h> -#include "atlimagedx.h" +#include <ui/CWaitCursor.h> #include <debug.h> @@ -49,7 +55,41 @@ #include "toolsmodel.h" #include "main.h" #include "dialogs.h" -#include <ui/CWaitCursor.h> -#include "globalvar.h" +#include "atlimagedx.h" + +/* GLOBAL VARIABLES *************************************************/ + +extern HINSTANCE g_hinstExe; + +extern WCHAR g_szFileName[MAX_LONG_PATH]; +extern BOOL g_isAFile; +extern BOOL g_imageSaved; +extern BOOL g_showGrid; +extern BOOL g_askBeforeEnlarging; + +extern CMainWindow mainWindow; + +extern CMirrorRotateDialog mirrorRotateDialog; +extern CAttributesDialog attributesDialog; +extern CStretchSkewDialog stretchSkewDialog; +extern CFontsDialog fontsDialog; + +extern RegistrySettings registrySettings; +extern ImageModel imageModel; +extern ToolsModel toolsModel; +extern SelectionModel selectionModel; +extern PaletteModel paletteModel; + +extern HWND g_hStatusBar; +extern float g_xDpi; +extern float g_yDpi; +extern INT g_fileSize; +extern SYSTEMTIME g_fileTime; -#endif /* _MSPAINT_H */ +extern CFullscreenWindow fullscreenWindow; +extern CMiniatureWindow miniature; +extern CToolBox toolBoxContainer; +extern CToolSettingsWindow toolSettingsWindow; +extern CPaletteWindow paletteWindow; +extern CCanvasWindow canvasWindow; +extern CTextEditWindow textEditWindow;
