Cosmetics

This commit is contained in:
Birunthan Mohanathas 2012-12-13 20:12:37 +02:00
parent e7fa91b924
commit 1acc613beb
3 changed files with 17 additions and 15 deletions

View File

@ -27,9 +27,7 @@ public:
CDialogAbout();
virtual ~CDialogAbout();
INT_PTR OnInitDialog(WPARAM wParam, LPARAM lParam);
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
static CDialog* GetDialog() { return c_Dialog; }
static void Open(int tab = 0);
static void Open(const WCHAR* name);
@ -39,11 +37,11 @@ public:
static void UpdateSkins();
static void UpdateMeasures(CMeterWindow* meterWindow);
static WINDOWPLACEMENT c_WindowPlacement;
static CDialogAbout* c_Dialog;
protected:
virtual INT_PTR HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR OnInitDialog(WPARAM wParam, LPARAM lParam);
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
private:
// Log tab
@ -169,6 +167,9 @@ private:
CTabSkins m_TabSkins;
CTabPlugins m_TabPlugins;
CTabVersion m_TabVersion;
static WINDOWPLACEMENT c_WindowPlacement;
static CDialogAbout* c_Dialog;
};
#endif

View File

@ -1951,10 +1951,10 @@ INT_PTR CDialogManage::CTabSettings::OnCommand(WPARAM wParam, LPARAM lParam)
Rainmeter->m_ResourceInstance = LoadLibraryEx(resource.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
Rainmeter->m_ResourceLCID = lcid;
if (CDialogAbout::c_Dialog)
if (CDialogAbout::GetDialog())
{
int sel = TabCtrl_GetCurSel(CDialogAbout::c_Dialog->GetControl(CDialogManage::Id_Tab));
SendMessage(CDialogAbout::c_Dialog->GetWindow(), WM_CLOSE, 0, 0);
int sel = TabCtrl_GetCurSel(CDialogAbout::GetDialog()->GetControl(CDialogManage::Id_Tab));
SendMessage(CDialogAbout::GetDialog()->GetWindow(), WM_CLOSE, 0, 0);
if (sel == 0)
{
Rainmeter->DelayedExecuteCommand(L"!About");

View File

@ -27,9 +27,7 @@ public:
CDialogManage();
virtual ~CDialogManage();
INT_PTR OnInitDialog(WPARAM wParam, LPARAM lParam);
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
static CDialog* GetDialog() { return c_Dialog; }
static void Open(const WCHAR* name);
static void Open(int tab = 0);
@ -37,11 +35,11 @@ public:
static void UpdateSkins(CMeterWindow* meterWindow, bool deleted = false);
static WINDOWPLACEMENT c_WindowPlacement;
static CDialogManage* c_Dialog;
protected:
virtual INT_PTR HandleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR OnInitDialog(WPARAM wParam, LPARAM lParam);
INT_PTR OnNotify(WPARAM wParam, LPARAM lParam);
INT_PTR OnCommand(WPARAM wParam, LPARAM lParam);
private:
// Skins tab
@ -177,6 +175,9 @@ private:
CTabSkins m_TabSkins;
CTabLayouts m_TabLayouts;
CTabSettings m_TabSettings;
static WINDOWPLACEMENT c_WindowPlacement;
static CDialogManage* c_Dialog;
};
#endif