Issue #276 - eliminate CString from GetBrowserLanguage

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "COM_Value.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
@@ skipping 76 matching lines @@
   m_hStatusBarWnd = NULL;
   m_hPaneWnd = NULL;
   m_nPaneWidth = 0;
   m_pWndProcStatus = NULL;
   m_hTheme = NULL;
   m_isInitializedOk = false;
 
 
   m_tab = new CPluginTab(this);
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
-  std::wstring locale((LPCWSTR)system->GetBrowserLanguage());
-  Dictionary::Create(locale);
+  Dictionary::Create(GetBrowserLanguage());
 }
 
 CPluginClass::~CPluginClass()
 {
   delete m_tab;
 }
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Initialization
@@ skipping 138 matching lines @@
 
 
 // This gets called when a new browser window is created (which also triggers the
 // creation of this object). The pointer passed in should be to a IWebBrowser2
 // interface that represents the browser for the window.
 // it is also called when a tab is closed, this unknownSite will be null
 // so we should handle that it is called this way several times during a session
 STDMETHODIMP CPluginClass::SetSite(IUnknown* unknownSite)
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
-  CPluginSystem* system = CPluginSystem::GetInstance();
 
   MULTIPLE_VERSIONS_CHECK();
 
   if (unknownSite)
   {
 
     DEBUG_GENERAL(L"================================================================================\nNEW TAB UI\n================================================================================")
 
     HRESULT hr = ::CoInitialize(NULL);
     if (FAILED(hr))
@@ skipping 989 matching lines @@
     CloseHandle(hToken);
   }
 
   return fRet;
 }
 
 void CPluginClass::DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags)
 {
   CPluginClient* client = CPluginClient::GetInstance();
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
   // Create menu parent window
   HWND hMenuWnd = ::CreateWindowEx(
     NULL,
     MAKEINTATOM(GetAtomPaneClass()),
     L"",
     0,
     0,0,0,0,
     NULL,
     NULL,
     _Module.m_hInst,
@@ skipping 387 matching lines @@
 
 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
   // Find tab
   CPluginClass *pClass = FindInstance(GetParent(hWnd));
   if (!pClass)
   {
     return ::DefWindowProc(hWnd, message, wParam, lParam);
   }
 
-  CPluginSystem* system = CPluginSystem::GetInstance();
-
   // Process message
   switch (message)
   {
 
   case WM_SETCURSOR:
     {
       ::SetCursor(::LoadCursor(NULL, IDC_ARROW));
       return TRUE;
     }
   case WM_PAINT:
@@ skipping 305 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }