CComponentsText: add member clearCCText()

src/gui/components/cc.h

@@ -224,6 +224,7 @@ class CComponentsText : public CComponentsItem
 		Font		* ct_font;
 
 		void initVarText();
+		void clearCCText();
 	private:
 		const char* ct_text;
 		int ct_text_mode; //see textbox.h for possible modes
@@ -231,7 +232,7 @@ class CComponentsText : public CComponentsItem
 		bool ct_text_sended;
 
 		
-		void initText();
+		void initCCText();
 
 	public:
 		CComponentsText();

src/gui/components/components.cpp

@@ -274,15 +274,7 @@ CComponentsText::~CComponentsText()
 {
 	hide();
 	clearSavedScreen();
-	
+	clearCCText();
-	if (ct_box)
-		delete ct_box;
-	ct_box = NULL;
-	
-	if (ct_textbox)
-		delete ct_textbox;
-	ct_textbox = NULL;
-	
 	clear();
 }
 
@@ -303,7 +295,7 @@ void CComponentsText::initVarText()
 }
 
 
-void CComponentsText::initText()
+void CComponentsText::initCCText()
 {
 	//set default font, if is no font definied
 	if (ct_font == NULL)
@@ -338,9 +330,20 @@ void CComponentsText::initText()
 	ct_text_sended = ct_textbox->setText(&new_text, width);
 }
 
+void CComponentsText::clearCCText()
+{
+	if (ct_box)
+		delete ct_box;
+	ct_box = NULL;
+
+	if (ct_textbox)
+		delete ct_textbox;
+	ct_textbox = NULL;
+}
+
 void CComponentsText::paint(bool do_save_bg)
 {
-	initText();
+	initCCText();
 	paintInit(do_save_bg);
 	if (ct_text_sended)
 		ct_textbox->paint();
@@ -397,15 +400,7 @@ CComponentsInfoBox::~CComponentsInfoBox()
 {
 	hide();
 	clearSavedScreen();
-	
+	clearCCText();
-	if (ct_textbox)
-		delete ct_textbox;
-	ct_textbox = NULL;
-	
-	if (ct_box)
-		delete ct_box;
-	ct_box = NULL;
-	
 	delete pic;
 	clear();
 }