CHANGED: #1471 CCtrlButton is now under the NLGUI namespace.

code/nel/include/nel/gui/ctrl_button.h

@@ -25,7 +25,6 @@
 namespace NLGUI
 {
 	class CEventDescriptor;
-}
 
 	/**
 	 * <Class description>
@@ -96,6 +95,7 @@ private:
 		sint32	_Align;		/// 1st bit - Left/Right (0/1) 2nd bit - Bottom/Top (0/1)
 	};
 
+}
 
 #endif // RZ_CTRL_BUTTON_H
 

code/nel/src/gui/ctrl_button.cpp

@@ -14,9 +14,6 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
-
 #include "nel/gui/ctrl_button.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "nel/gui/widget_manager.h"
@@ -29,6 +26,9 @@ using namespace NL3D;
 
 NLMISC_REGISTER_OBJECT(CViewBase, CCtrlButton, std::string, "button");
 
+namespace NLGUI
+{
+
 	// ----------------------------------------------------------------------------
 	bool CCtrlButton::parse(xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	{
@@ -345,3 +345,6 @@ bool CCtrlButton::getMouseOverShape(string &texName, uint8 &rot, CRGBA &col)
 		
 		return false;
 	}
+
+}
+

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h

@@ -27,9 +27,13 @@
 #include "dbctrl_sheet.h"
 #include "view_text.h"
 
+namespace NLGUI
+{
+	class CCtrlButton;
+}
+
 
 // ***************************************************************************
-class	CCtrlButton;
 class	CCtrlScroll;
 class	CHandlerListSheetTradeSelect;
 class	CHandlerListSheetTradeRightClick;

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h

@@ -23,9 +23,13 @@
 #include "dbgroup_list_sheet_text.h"
 #include "game_share/bot_chat_types.h"
 
+namespace NLGUI
+{
+	class	CCtrlButton;
+}
+
 
 // ***************************************************************************
-class	CCtrlButton;
 class	CCtrlScroll;
 class	CHandlerListSheetTradeSelect;
 class	CHandlerListSheetTradeRightClick;

code/ryzom/client/src/interface_v3/group_container.h

@@ -26,10 +26,10 @@
 namespace NLGUI
 {
 	class CEventDescriptorLocalised;
+	class CCtrlButton;
 }
 
 class CInterfaceList;
-class CCtrlButton;
 class CCtrlScroll;
 class CViewText;
 class COptionsContainerInsertion;

code/ryzom/client/src/interface_v3/group_html.h

@@ -37,9 +37,13 @@ extern "C"
 #include "WWWInit.h"
 }
 
+namespace NLGUI
+{
+	class CCtrlButton;
+}
+
 class CGroupList;
 class CCtrlScroll;
-class CCtrlButton;
 class CDBGroupComboBox;
 class CGroupParagraph;