From c3cf08646ddb579ed3c0e18b8510c9a3d23e6d9c Mon Sep 17 00:00:00 2001
From: cyberwarriorx <cyberwarriorx@users.sf.net>
Date: Tue, 18 Apr 2006 19:01:26 +0000
Subject: [PATCH] -Added English Menu's for screenshots -Fixed a strange issue
 where yopyop_private.rc was including itself

---
 desmume/src/windows/resource.h        | 5 ++---
 desmume/src/windows/resources.rc      | 2 ++
 desmume/src/windows/yopyop_private.rc | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 051d012a3..452c0f0b0 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -63,6 +63,8 @@ void refreshAll();
 #define IDM_SBG2            127
 #define IDM_SBG3            128
 #define IDM_OAM             129
+#define IDM_PRINTSCREEN          140
+#define IDM_QUICK_PRINTSCREEN    141
 
 #define IDD_MEM_VIEWER      301
 #define IDC_8_BIT           302
@@ -148,7 +150,4 @@ void refreshAll();
 #define IDC_PROP0               908
 #define IDC_PROP1               909
 #define IDC_OAM_BOX             910
-
-#define IDM_PRINTSCREEN          140
-#define IDM_QUICK_PRINTSCREEN    141
 #endif
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 6b10a8942..32a2827d1 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -293,6 +293,8 @@ MENU_PRINCIPAL MENU
  {
   MENUITEM "&Open", IDM_OPEN
   MENUITEM "&Info rom", IDM_GAME_INFO
+  MENUITEM "Save Screenshot &As", IDM_PRINTSCREEN
+  MENUITEM "&Quick Screenshot", IDM_QUICK_PRINTSCREEN
   MENUITEM SEPARATOR
   MENUITEM "&Quit", IDM_QUIT
  }
diff --git a/desmume/src/windows/yopyop_private.rc b/desmume/src/windows/yopyop_private.rc
index 01abcd78a..8e964fb51 100644
--- a/desmume/src/windows/yopyop_private.rc
+++ b/desmume/src/windows/yopyop_private.rc
@@ -4,7 +4,6 @@
 #include <windows.h> // include for version info constants
 
 #include "resources.rc"
-#include "yopyop_private.rc"
 
 //
 // SUPPORT FOR WINDOWS XP THEMES: