From 99d7bf724d7c0a90738e229e01b9053104f78b02 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Wed, 2 Sep 2009 22:31:02 +0000 Subject: [PATCH] General: Removed duplicate comment and an old comment about wx git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4174 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/wxWidgets/include/msvc/wx/setup.h | 41 --------------------- Source/Core/DolphinWX/Src/FrameAui.cpp | 14 +------ Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +- 3 files changed, 2 insertions(+), 55 deletions(-) diff --git a/Externals/wxWidgets/include/msvc/wx/setup.h b/Externals/wxWidgets/include/msvc/wx/setup.h index 6ddc636cb3..22a4d2c39f 100644 --- a/Externals/wxWidgets/include/msvc/wx/setup.h +++ b/Externals/wxWidgets/include/msvc/wx/setup.h @@ -10,47 +10,6 @@ ///////////////////////////////////////////////////////////////////////////// - - -// ======================================================= -// A guide to all the setup.h versions -// ------------- -/* The included setup files are: - - include\msvc\wx\setup.h + This file - include\wx\msw\wince\setup.h - Not used in regular builds - lib\vc_lib\msw\wx\setup.h + Library configuration, Release and DebugFast builds - lib\vc_lib\mswd\wx\setup.h + Library configuration, Debug builds - lib\vc_dll\msw\wx\setup.h - Not used, dll version only - lib\vc_dll\mswd\wx\setup.h - Not used, dll version only - - These are identical or almost identical and I'm not sure which one that applies - in case they are different: - - include\wx\setup.h ? - include\wx\msw\setup.h ? - include\wx\univ\setup.h ? - include\wx\msw\setup0.h - The original msw file, not used - include\wx\univ\setup0.h - The original univ file, not used - - The configuration consistency check files: - - include\wx\chkconf.h ? - include\wx\msw\chkconf.h ? - include\wx\univ\chkconf.h ? - include\wx\msw\wince\chkconf.h - Not used in regular builds - - Issues: - - The Debug build will break in CFrame::InitBitmaps() at the ConvertToImage() line - with a "assert "wxWidgets Debug Alert, bmp.Ok()" error message, the cause is unknown, - to me at least. -*/ -// ============= - - - - // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined // explicitly! diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp index 58a8b178b3..afb1107aa8 100644 --- a/Source/Core/DolphinWX/Src/FrameAui.cpp +++ b/Source/Core/DolphinWX/Src/FrameAui.cpp @@ -16,19 +16,7 @@ // http://code.google.com/p/dolphin-emu/ -/* -1.1 Windows - -CFrame is the main parent window. Inside CFrame there is m_Panel which is the -parent for the rendering window (when we render to the main window). In Windows -the rendering window is created by giving CreateWindow() m_Panel->GetHandle() -as parent window and creating a new child window to m_Panel. The new child -window handle that is returned by CreateWindow() can be accessed from -Core::GetWindowHandle(). -*/ - - -// FIXME: why doesn't it work on windows??? +// Why doesn't it work on windows? #ifndef _WIN32 #include "Common.h" #endif diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index d95a649274..5266115629 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -28,7 +28,7 @@ Core::GetWindowHandle(). */ -// FIXME: why doesn't it work on windows??? +// Why doesn't it work on windows? #ifndef _WIN32 #include "Common.h" #endif