MTextControl's support removed from Popup+

1 files changed, 1 insertions, 13 deletions

diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 43267d16b4..953d0e5dca 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -72,7 +72,6 @@ static void updatePreviewImage(HWND hwndBox)
 

 	if (wndPreview) delete wndPreview;

 	wndPreview = new PopupWnd2(&ppd, &customOptions, true);

-	wndPreview->buildMText();

 	wndPreview->update();

 	gPreviewOk = true;

 

@@ -192,8 +191,7 @@ static LPTSTR mainOption[] = {
 	LPGENW("Drop shadow effect"),

 	LPGENW("Drop shadow effect") L"/" LPGENW("non rectangular"),

 	LPGENW("Enable Aero Glass (Vista+)"),

-	LPGENW("Use Windows colors"),

-	LPGENW("Use advanced text render") };

+	LPGENW("Use Windows colors") };

 

 int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions)

 {

@@ -221,11 +219,6 @@ int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos,
 			*dwGlobalOptions |= PopupOptions.UseWinColors ? (1 << i) : 0;

 			bCheck = PopupOptions.UseWinColors;

 			break;

-		case 5:

-			if (!(htuText&&htuTitle)) continue;

-			*dwGlobalOptions |= PopupOptions.UseMText ? (1 << i) : 0;

-			bCheck = PopupOptions.UseMText;

-			break;

 		}

 		*OptionsCount += 1;

 		options = (OPTTREE_OPTION*)mir_realloc(options, sizeof(OPTTREE_OPTION)*(*OptionsCount));

@@ -287,7 +280,6 @@ void LoadOption_Skins() {
 	PopupOptions.EnableFreeformShadows = g_plugin.getByte("EnableShadowRegion", 1);

 	PopupOptions.EnableAeroGlass = g_plugin.getByte("EnableAeroGlass", 1);

 	PopupOptions.UseWinColors = g_plugin.getByte("UseWinColors", FALSE);

-	PopupOptions.UseMText = g_plugin.getByte("UseMText", TRUE);

 }

 

 INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -324,9 +316,6 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				case (1 << 4) :

 					PopupOptions.UseWinColors = skinOptions[index].bState;

 					break;

-				case (1 << 5) :

-					PopupOptions.UseMText = skinOptions[index].bState;

-					break;

 				}

 			}

 			updatePreviewImage(GetDlgItem(hwndDlg, IDC_PREVIEWBOX));

@@ -476,7 +465,6 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 					g_plugin.setByte("EnableShadowRegion", PopupOptions.EnableFreeformShadows);

 					g_plugin.setByte("EnableAeroGlass", PopupOptions.EnableAeroGlass);

 					g_plugin.setByte("UseWinColors", PopupOptions.UseWinColors);

-					g_plugin.setByte("UseMText", PopupOptions.UseMText);

 				}// end PSN_APPLY:

 				return TRUE;

 			}// switch (((LPNMHDR)lParam)->code)