From 2eab8c71d165dd0c24b41bbeaf1c6e409201a446 Mon Sep 17 00:00:00 2001 From: Daveo Date: Wed, 15 Nov 2000 22:15:58 +0000 Subject: [PATCH] --- Utils/MapEdit/MapEdit.clw | 71 ++++++++++++++++++--------------------- Utils/MapEdit/MapEdit.cpp | 5 +-- Utils/MapEdit/MapEdit.dsp | 9 +++-- Utils/MapEdit/MapEdit.rc | 18 +++------- 4 files changed, 46 insertions(+), 57 deletions(-) diff --git a/Utils/MapEdit/MapEdit.clw b/Utils/MapEdit/MapEdit.clw index 0149cd876..8d5f3faf8 100644 --- a/Utils/MapEdit/MapEdit.clw +++ b/Utils/MapEdit/MapEdit.clw @@ -18,17 +18,17 @@ Class6=CMapEditDoc Class7=CMapEditView ResourceCount=9 -Resource1=IDD_MULTIBAR (English (U.S.)) -Resource2=IDR_MAPEDITYPE (English (U.S.)) -Resource3=IDD_TILESET_DIALOG +Resource1=IDD_TILESET_DIALOG +Resource2=IDR_MAINFRAME (English (U.S.)) +Resource3=IDR_MAPEDITYPE (English (U.S.)) Resource4=IDD_DIALOGBAR (English (U.S.)) -Resource5=IDR_TOOLBAR (English (U.S.)) +Resource5=IDD_ABOUTBOX (English (U.S.)) Class8=CMultiBar -Resource6=IDD_ABOUTBOX (English (U.S.)) -Resource7=IDR_MAINFRAME (English (U.S.)) +Resource6=IDD_LAYER_LIST_DIALOG +Resource7=IDD_MULTIBAR (English (U.S.)) Class9=CLayerList Class10=CTileSetDlg -Resource8=IDD_LAYER_LIST_DIALOG +Resource8=IDR_TOOLBAR (English (U.S.)) Class11=CGfxToolBar Resource9=IDD_GFXTOOLBAR @@ -94,24 +94,21 @@ Command3=ID_FILE_SAVE Command4=ID_EDIT_CUT Command5=ID_EDIT_COPY Command6=ID_EDIT_PASTE -Command7=ID_FILE_PRINT -Command8=ID_APP_ABOUT -Command9=ID_TOOLBAR_TILEPALETTE -Command10=ID_TOOLBAR_GRID -CommandCount=10 +Command7=ID_TOOLBAR_TILEPALETTE +Command8=ID_TOOLBAR_GRID +CommandCount=8 [MNU:IDR_MAINFRAME (English (U.S.))] Type=1 Class=? Command1=ID_FILE_NEW Command2=ID_FILE_OPEN -Command3=ID_FILE_PRINT_SETUP -Command4=ID_FILE_MRU_FILE1 -Command5=ID_APP_EXIT -Command6=ID_VIEW_TOOLBAR -Command7=ID_VIEW_STATUS_BAR -Command8=ID_APP_ABOUT -CommandCount=8 +Command3=ID_FILE_MRU_FILE1 +Command4=ID_APP_EXIT +Command5=ID_VIEW_TOOLBAR +Command6=ID_VIEW_STATUS_BAR +Command7=ID_APP_ABOUT +CommandCount=7 [MNU:IDR_MAPEDITYPE (English (U.S.))] Type=1 @@ -121,23 +118,20 @@ Command2=ID_FILE_OPEN Command3=ID_FILE_CLOSE Command4=ID_FILE_SAVE Command5=ID_FILE_SAVE_AS -Command6=ID_FILE_PRINT -Command7=ID_FILE_PRINT_PREVIEW -Command8=ID_FILE_PRINT_SETUP -Command9=ID_FILE_MRU_FILE1 -Command10=ID_APP_EXIT -Command11=ID_EDIT_UNDO -Command12=ID_EDIT_CUT -Command13=ID_EDIT_COPY -Command14=ID_EDIT_PASTE -Command15=ID_VIEW_TOOLBAR -Command16=ID_VIEW_STATUS_BAR -Command17=ID_WINDOW_NEW -Command18=ID_WINDOW_CASCADE -Command19=ID_WINDOW_TILE_HORZ -Command20=ID_WINDOW_ARRANGE -Command21=ID_APP_ABOUT -CommandCount=21 +Command6=ID_FILE_MRU_FILE1 +Command7=ID_APP_EXIT +Command8=ID_EDIT_UNDO +Command9=ID_EDIT_CUT +Command10=ID_EDIT_COPY +Command11=ID_EDIT_PASTE +Command12=ID_VIEW_TOOLBAR +Command13=ID_VIEW_STATUS_BAR +Command14=ID_WINDOW_NEW +Command15=ID_WINDOW_CASCADE +Command16=ID_WINDOW_TILE_HORZ +Command17=ID_WINDOW_ARRANGE +Command18=ID_APP_ABOUT +CommandCount=18 [ACL:IDR_MAINFRAME (English (U.S.))] Type=1 @@ -161,11 +155,10 @@ CommandCount=14 [DLG:IDD_ABOUTBOX (English (U.S.))] Type=1 Class=? -ControlCount=4 +ControlCount=3 Control1=IDC_STATIC,static,1342177283 Control2=IDC_STATIC,static,1342308480 -Control3=IDC_STATIC,static,1342308352 -Control4=IDOK,button,1342373889 +Control3=IDOK,button,1342373889 [DLG:IDD_DIALOGBAR (English (U.S.))] Type=1 diff --git a/Utils/MapEdit/MapEdit.cpp b/Utils/MapEdit/MapEdit.cpp index 56e23cdb5..b4f7ff1d9 100644 --- a/Utils/MapEdit/MapEdit.cpp +++ b/Utils/MapEdit/MapEdit.cpp @@ -96,8 +96,9 @@ BOOL CMapEditApp::InitInstance() CCommandLineInfo cmdInfo; ParseCommandLine(cmdInfo); // Prevent creating new doc on startup (should still open cmd line file tho) -// if (cmdInfo.m_nShellCommand==CCommandLineInfo::FileNew) cmdInfo.m_nShellCommand=CCommandLineInfo::FileNothing; - +#ifndef _DEBUG + if (cmdInfo.m_nShellCommand==CCommandLineInfo::FileNew) cmdInfo.m_nShellCommand=CCommandLineInfo::FileNothing; +#endif // Dispatch commands specified on the command line if (!ProcessShellCommand(cmdInfo)) return FALSE; diff --git a/Utils/MapEdit/MapEdit.dsp b/Utils/MapEdit/MapEdit.dsp index b7a0e430b..75102ddac 100644 --- a/Utils/MapEdit/MapEdit.dsp +++ b/Utils/MapEdit/MapEdit.dsp @@ -40,9 +40,10 @@ RSC=rc.exe # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\GinLib" /I "..\glibdev\glib\include" /I "..\glibdev\glib\include\pc" /I "..\ginlib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" @@ -52,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 /nologo /subsystem:windows /machine:I386 +# ADD LINK32 opengl32.lib glu32.lib win32lib.lib ginlib.lib glaux.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\ginlib\release\\" /libpath:"..\GlibDev\glib\LIB\win32lib\release\\" !ELSEIF "$(CFG)" == "MapEdit - Win32 Debug" @@ -287,6 +288,10 @@ SOURCE=.\res\picker.ico # End Source File # Begin Source File +SOURCE=.\res\select.ico +# End Source File +# Begin Source File + SOURCE=.\res\Toolbar.bmp # End Source File # End Group diff --git a/Utils/MapEdit/MapEdit.rc b/Utils/MapEdit/MapEdit.rc index a63633c6b..69775b192 100644 --- a/Utils/MapEdit/MapEdit.rc +++ b/Utils/MapEdit/MapEdit.rc @@ -53,10 +53,6 @@ BEGIN BUTTON ID_EDIT_COPY BUTTON ID_EDIT_PASTE SEPARATOR - BUTTON ID_FILE_PRINT - SEPARATOR - BUTTON ID_APP_ABOUT - SEPARATOR BUTTON ID_TOOLBAR_TILEPALETTE BUTTON ID_TOOLBAR_GRID END @@ -74,8 +70,6 @@ BEGIN MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&Open...\tCtrl+O", ID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR MENUITEM "Recent File", ID_FILE_MRU_FILE1, GRAYED MENUITEM SEPARATOR MENUITEM "E&xit", ID_APP_EXIT @@ -101,10 +95,6 @@ BEGIN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE MENUITEM "Save &As...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&Print...\tCtrl+P", ID_FILE_PRINT - MENUITEM "Print Pre&view", ID_FILE_PRINT_PREVIEW - MENUITEM "P&rint Setup...", ID_FILE_PRINT_SETUP - MENUITEM SEPARATOR MENUITEM "Recent File", ID_FILE_MRU_FILE1, GRAYED MENUITEM SEPARATOR MENUITEM "E&xit", ID_APP_EXIT @@ -170,9 +160,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "About MapEdit" FONT 8, "MS Sans Serif" BEGIN - ICON IDR_MAINFRAME,IDC_STATIC,11,17,20,20 - LTEXT "MapEdit Version 1.0",IDC_STATIC,40,10,119,8,SS_NOPREFIX - LTEXT "Copyright (C) 2000",IDC_STATIC,40,25,119,8 + ICON IDR_MAINFRAME,IDC_STATIC,5,5,21,20 + LTEXT "MapEdit\n\nBy Dave 2000",IDC_STATIC,40,10,119,40, + SS_NOPREFIX DEFPUSHBUTTON "OK",IDOK,178,7,50,14,WS_GROUP END @@ -416,7 +406,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_PAINT ICON DISCARDABLE "res\\paint.ico" -IDI_SELECT ICON DISCARDABLE "res\\paint1.ico" +IDI_SELECT ICON DISCARDABLE "res\\select.ico" IDI_PICKER ICON DISCARDABLE "res\\picker.ico" IDI_MIRRORX ICON DISCARDABLE "res\\mirrorx.ico" IDI_MIRRORY ICON DISCARDABLE "res\\mirrory.ico"