Replaced resource.h because the old one was a disaster

Dialogs.rc

@@ -1,124 +1,25 @@
-// Microsoft Visual C++ generated resource script.
-//
+// Generated by ResEdit 1.6.6
+// Copyright (C) 2006-2015
+// http://www.resedit.net
+
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
 #include "resource.h"
 
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
+
+
+
 //
-// Generated from the TEXTINCLUDE 2 resource.
+// Bitmap resources
 //
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "roblox_RN1_icon.ico"
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Canada) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN
-#pragma code_page(1252)
-#endif //_WIN32
+IDB_BITMAP1        BITMAP         "Parts.bmp"
+
+
 
-/////////////////////////////////////////////////////////////////////////////
 //
-// Bitmap
+// Icon resources
 //
-
-IDB_BITMAP1             BITMAP                  "Parts.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG1 DIALOGEX 0, 0, 304, 46
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,247,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,247,24,50,14
-	EDITTEXT        IDC_EDIT1,68,7,162,14,ES_AUTOHSCROLL
-    LTEXT           "Class:",-1,43,7,20,8
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 297
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 39
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (Canada) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDI_ICON1          ICON           "roblox_RN1_icon.ico"

src/include/resource.h

@@ -1,7 +0,0 @@
-#define IDC_PROPERTYGRID                2000
-#define IDC_STATIC						2
-
-#define IDE_EDIT								105
-#define IDI_ICON1                               102
-#define IDB_BITMAP1                             103
-#define IDD_DIALOG1                             104

src/source/Application.cpp

@@ -1,7 +1,7 @@
 #include <G3DAll.h>
 #include <initguid.h>
 #include <iomanip>
-#include "resource.h"
+#include "../../resource.h"
 #include "DataModelV2/Instance.h"
 #include "DataModelV2/PartInstance.h"
 #include "DataModelV2/TextButtonInstance.h"

src/source/PropertyWindow.cpp

@@ -1,7 +1,7 @@
 #define _WINSOCKAPI_
 #include <windows.h>
 #include "WindowFunctions.h"
-#include "resource.h"
+#include "../../resource.h"
 #include "PropertyWindow.h"
 #include "Globals.h"
 #include "strsafe.h"

src/source/main.cpp

@@ -1,6 +1,6 @@
 // TODO: Move toolbar buttons with resized window.
 #include "winver.h"
-#include "resource.h"
+#include "../../resource.h"
 #include "Application.h"
 #include "WindowFunctions.h"
 #include "ax.h"