/[pcsx2_0.9.7]/trunk/pcsx2/gui/App.h
ViewVC logotype

Diff of /trunk/pcsx2/gui/App.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/pcsx2/gui/App.h	2010/12/23 11:48:33	279
+++ trunk/pcsx2/gui/App.h	2010/12/23 12:02:12	280
@@ -47,6 +47,14 @@
 // single for-loop to create them.
 static const int PluginMenuId_Interval = 0x10;
 
+// ID and return code used for modal popups that have a custom button.
+static const wxWindowID pxID_CUSTOM = wxID_LOWEST - 1;
+
+// Return code used by first time wizard if the dialog needs to be automatically recreated
+// (assigned an arbitrary value)
+static const wxWindowID pxID_RestartWizard = wxID_LOWEST - 100;
+
+
 // Forces the Interface to destroy the GS viewport window when the GS plugin is
 // destroyed.  This has the side effect of forcing all plugins to close and re-open
 // along with the GS, since the GS viewport window handle will have changed.
@@ -107,7 +115,9 @@
 	MenuId_Config_SysSettings,
 	MenuId_Config_McdSettings,
 	MenuId_Config_AppSettings,
+	MenuId_Config_GameDatabase,
 	MenuId_Config_BIOS,
+	MenuId_Config_Language,
 
 	// Plugin ID order is important.  Must match the order in tbl_PluginInfo.
 	MenuId_Config_GS,
@@ -180,14 +190,15 @@
 			Gamefixes,
 			MemoryCard,
 			Video,
-			Cpu;
+			Cpu,
+			Appearance;
 
 		ConfigIds()
 		{
-			Paths		= Plugins	=
-			Speedhacks	= Gamefixes	=
-			Video		= Cpu		= 
-			MemoryCard	= -1;
+			Paths		= Plugins		=
+			Speedhacks	= Gamefixes		=
+			Video		= Cpu			= 
+			MemoryCard	= Appearance	= -1;
 		}
 	} Config;
 
@@ -358,6 +369,10 @@
 public:
 	virtual ~Pcsx2AppTraits() {}
 	wxMessageOutput* CreateMessageOutput();
+
+#ifdef wxUSE_STDPATHS
+	wxStandardPathsBase& GetStandardPaths();
+#endif
 };
 
 // =====================================================================================================
@@ -475,7 +490,7 @@
 	// blocked threads stalling the GUI.
 	ExecutorThread					SysExecutorThread;
 	ScopedPtr<SysCpuProviderPack>	m_CpuProviders;
-	ScopedPtr<SysAllocVM>			m_VmAllocs;
+	ScopedPtr<SysMainMemory>	m_VmReserve;
 
 protected:
 	wxWindowID			m_id_MainFrame;
@@ -497,6 +512,8 @@
 	void SysExecute( CDVD_SourceType cdvdsrc, const wxString& elf_override=wxEmptyString );
 	void LogicalVsync();
 	
+	SysMainMemory& GetVmReserve();
+	
 	GSFrame&		GetGsFrame() const;
 	MainEmuFrame&	GetMainFrame() const;
 
@@ -526,8 +543,6 @@
 	void StartPendingSave();
 	void ClearPendingSave();
 	
-	void AllocateVM();
-
 	// --------------------------------------------------------------------------
 	//  App-wide Resources
 	// --------------------------------------------------------------------------

 

  ViewVC Help
Powered by ViewVC 1.1.22