Removed tabs from applet code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/applet/applet.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-*						wxWindows HTML Applet Package
+*                       wxWindows HTML Applet Package
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
@@ -23,8 +23,8 @@
 *  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
 *  ======================================================================
 *
-* Language:		ANSI C++
+* Language:     ANSI C++
-* Environment:	Any
+* Environment:  Any
 *
 * Description:  Main wxApplet class implementation
 *
@@ -53,14 +53,14 @@ REMARKS:
 Psuedo virtual constructor for the wxApplet class.
 ****************************************************************************/
 bool wxApplet::Create(
-	wxHtmlAppletWindow *parent,
+    wxHtmlAppletWindow *parent,
-	const wxSize& size,
+    const wxSize& size,
-	long style)
+    long style)
 {
     bool ret = wxPanel::Create(parent, -1, wxDefaultPosition, size, style);
     if (ret) {
-		m_Parent = parent;
+        m_Parent = parent;
-		}
+        }
     return ret;
 }
 
@@ -70,7 +70,7 @@ Destructor for the wxApplet class.
 ****************************************************************************/
 wxApplet::~wxApplet()
 {
-	m_Parent->RemoveApplet(this);			
+    m_Parent->RemoveApplet(this);           
 }
 
 /****************************************************************************
@@ -78,7 +78,7 @@ REMARKS:
 Special handler for background erase messages. We do nothing in here which
 causes the background to not be erased which is exactly what we want. All
 the wxApplet classes display over an HTML window, so we want the HTML
-background to show through. 			
+background to show through.             
 ****************************************************************************/
 void wxApplet::OnEraseBackground(wxEraseEvent&)
 {

contrib/applet/appletwindow.cpp

@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-*						wxWindows HTML Applet Package
+*                       wxWindows HTML Applet Package
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
@@ -23,8 +23,8 @@
 *  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
 *  ======================================================================
 *
-* Language:		ANSI C++
+* Language:     ANSI C++
-* Environment:	Any
+* Environment:  Any
 *
 * Description:  Main wxHtmlAppletWindow class implementation
 *
@@ -56,16 +56,16 @@ REMARKS:
 Constructor for the applet window class.
 ****************************************************************************/
 wxHtmlAppletWindow::wxHtmlAppletWindow(
-	wxWindow *parent,
+    wxWindow *parent,
-	wxWindowID id,
+    wxWindowID id,
-	const wxPoint& pos,
+    const wxPoint& pos,
-	const wxSize& size,
+    const wxSize& size,
-	long style,
+    long style,
-	const wxString& name)
+    const wxString& name)
-	: wxHtmlWindow(parent,id,pos,size,style,name)
+    : wxHtmlWindow(parent,id,pos,size,style,name)
 {
-	// Ensure all cookie data is destroyed when window is killed
+    // Ensure all cookie data is destroyed when window is killed
-	m_Cookies.DeleteContents(true);
+    m_Cookies.DeleteContents(true);
 }
 
 /****************************************************************************
@@ -78,8 +78,8 @@ wxHtmlAppletWindow::~wxHtmlAppletWindow()
 
 /****************************************************************************
 PARAMETERS:
-className		- Name of the applet class to create an object for
+className       - Name of the applet class to create an object for
-size			- Initial size of the applet to be created
+size            - Initial size of the applet to be created
 
 RETURNS:
 Pointer to the wxApplet created, or NULL if unable to create the applet.
@@ -91,34 +91,34 @@ created dynamically based on string values embedded in the custom tags of an
 HTML page.
 ****************************************************************************/
 wxApplet *wxHtmlAppletWindow::CreateApplet(
-	const wxString& className,			
+    const wxString& className,          
-	const wxSize& size)
+    const wxSize& size)
 {
-	// We presently only allow one applet per page of the same class!
+    // We presently only allow one applet per page of the same class!
-	if (m_AppletList.Find(className))
+    if (m_AppletList.Find(className))
-		return NULL;
+        return NULL;
 
-	// Dynamically create the class instance at runtime
+    // Dynamically create the class instance at runtime
-	wxClassInfo *info = wxClassInfo::FindClass(className.c_str());
+    wxClassInfo *info = wxClassInfo::FindClass(className.c_str());
     if (!info)
         return NULL;
-	wxObject *obj = info->CreateObject();
+    wxObject *obj = info->CreateObject();
-	if (!obj)
+    if (!obj)
-		return NULL;
+        return NULL;
     wxApplet *applet = wxDynamicCast(obj,wxApplet);
-	if (!applet)
+    if (!applet)
-		return NULL;
+        return NULL;
-	if (!applet->Create(this,size))	{
+    if (!applet->Create(this,size)) {
-		delete applet;
+        delete applet;
-		return NULL;
+        return NULL;
-		}
+        }
-	m_AppletList.Append(className,applet);
+    m_AppletList.Append(className,applet);
-	return applet;
+    return applet;
 }
 
 /****************************************************************************
 PARAMETERS:
-appletName		- Name of the applet class to find
+appletName      - Name of the applet class to find
 
 RETURNS:
 Pointer to the wxApplet found, or NULL if not found.
@@ -127,17 +127,17 @@ REMARKS:
 Find an instance of an applet based on it's name
 ****************************************************************************/
 wxApplet *wxHtmlAppletWindow::FindApplet(
-	const wxString& appletName)
+    const wxString& appletName)
 {
-	wxAppletList::Node *node = m_AppletList.Find(appletName);
+    wxAppletList::Node *node = m_AppletList.Find(appletName);
-	if (!node)
+    if (!node)
-		return NULL;
+        return NULL;
-	return node->GetData();
+    return node->GetData();
-}			
+}           
 
 /****************************************************************************
 PARAMETERS:
-applet		- Pointer to the applet object to remove from the list
+applet      - Pointer to the applet object to remove from the list
 
 RETURNS:
 True if the applet was found and removed, false if not. The applet itself
@@ -147,20 +147,20 @@ REMARKS:
 Remove an applet from the manager. Called during applet destruction
 ****************************************************************************/
 bool wxHtmlAppletWindow::RemoveApplet(
-	const wxApplet *applet)
+    const wxApplet *applet)
 {
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
-		if (node->GetData() == applet) {
+        if (node->GetData() == applet) {
-			m_AppletList.DeleteNode(node);
+            m_AppletList.DeleteNode(node);
-			return true;
+            return true;
-			}
+            }
-		}
+        }
-	return false;
+    return false;
-}			
+}           
 
 /****************************************************************************
 PARAMETERS:
-URL	- New URL for the page to load
+URL - New URL for the page to load
 
 RETURNS:
 True if page loaded successfully, false if not
@@ -169,27 +169,27 @@ REMARKS:
 Remove an applet from the manager. Called during applet destruction
 ****************************************************************************/
 bool wxHtmlAppletWindow::LoadPage(
-	const wxString& hRef)
+    const wxString& hRef)
 {
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-		(node->GetData())->OnLinkClicked(hRef);
+        (node->GetData())->OnLinkClicked(hRef);
-	return wxHtmlWindow::LoadPage(hRef);
+    return wxHtmlWindow::LoadPage(hRef);
 }
 
 /****************************************************************************
 PARAMETERS:
-URL	- String URL that we are navigating to
+URL - String URL that we are navigating to
 
 REMARKS:
 Called when the user navigates to a new URL from the current page. We simply
 call the LoadPage function above to load the new page and display it.
 ****************************************************************************/
 void wxHtmlAppletWindow::OnLinkClicked(
-	const wxHtmlLinkInfo& link)
+    const wxHtmlLinkInfo& link)
 {
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-		(node->GetData())->OnLinkClicked(link);
+        (node->GetData())->OnLinkClicked(link);
-	wxHtmlWindow::LoadPage(link.GetHref());
+    wxHtmlWindow::LoadPage(link.GetHref());
 }
 
 /****************************************************************************
@@ -200,11 +200,11 @@ command prior to being destructed when the current page is destroyed.
 ****************************************************************************/
 bool wxHtmlAppletWindow::HistoryForward()
 {
-	if (!HistoryCanForward()) 	
+    if (!HistoryCanForward())   
-		return false;
+        return false;
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-		(node->GetData())->OnHistoryForward();
+        (node->GetData())->OnHistoryForward();
-	return wxHtmlWindow::HistoryForward();
+    return wxHtmlWindow::HistoryForward();
 }
 
 /****************************************************************************
@@ -215,16 +215,16 @@ command prior to being destructed when the current page is destroyed.
 ****************************************************************************/
 bool wxHtmlAppletWindow::HistoryBack()
 {
-	if (!HistoryCanBack()) 	
+    if (!HistoryCanBack())  
-		return false;
+        return false;
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext())
-		(node->GetData())->OnHistoryBack();
+        (node->GetData())->OnHistoryBack();
-	return wxHtmlWindow::HistoryBack();
+    return wxHtmlWindow::HistoryBack();
 }
 
 /****************************************************************************
 PARAMETERS:
-msg	- wxEvent message to be sent to all wxApplets
+msg - wxEvent message to be sent to all wxApplets
 
 REMARKS:
 This function is called by the wxApplet's when they need to send a message
@@ -238,25 +238,25 @@ the event handlers for the applets should not reset the wxEvent::Skip()
 value (ie: by default it is true).
 ****************************************************************************/
 void wxHtmlAppletWindow::SendMessage(
-	wxEvent& msg)
+    wxEvent& msg)
-{	
+{   
-	// Preset the skip flag
+    // Preset the skip flag
-	msg.Skip();
+    msg.Skip();
-	
+    
-	// Process all applets in turn and send them the message
+    // Process all applets in turn and send them the message
-	for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
+    for (wxAppletList::Node *node = m_AppletList.GetFirst(); node; node = node->GetNext()) {
-		(node->GetData())->OnMessage(msg);
+        (node->GetData())->OnMessage(msg);
-		if (!msg.GetSkipped())
+        if (!msg.GetSkipped())
-			break;
+            break;
-		}
+        }
 }
 
 /****************************************************************************
 PARAMETERS:
-msg	- wxEvent message to be sent to all wxApplets
+msg - wxEvent message to be sent to all wxApplets
 
 RETURNS:
-True if	new cookie was added, false if cookie with same name already exists.
+True if new cookie was added, false if cookie with same name already exists.
 
 REMARKS:
 This function is called by the wxApplet's when they need register a cookie
@@ -270,24 +270,24 @@ is would be able to re-load the prior state as though the applet
 was never actually destructed.
 
 Note: If a cookie with the same name already exists, this function returns
-	  false. Hence if you wish to replace a cookie you should first call
+      false. Hence if you wish to replace a cookie you should first call
-	  UnRegisterCookie to ensure the cookie is deleted and then call this
+      UnRegisterCookie to ensure the cookie is deleted and then call this
-	  function.
+      function.
 ****************************************************************************/
 bool wxHtmlAppletWindow::RegisterCookie(
-	const wxString& name,
+    const wxString& name,
-	wxObject *cookie)
+    wxObject *cookie)
 {
-	// Fail if the named cookie already exists!
+    // Fail if the named cookie already exists!
-	if (m_Cookies.Get(name))
+    if (m_Cookies.Get(name))
-		return false;
+        return false;
-	m_Cookies.Put(name,cookie);	
+    m_Cookies.Put(name,cookie); 
-	return true;
+    return true;
 }
 
 /****************************************************************************
 PARAMETERS:
-msg	- wxEvent message to be sent to all wxApplets
+msg - wxEvent message to be sent to all wxApplets
 
 RETURNS:
 True if found and deleted, false if not found in table.
@@ -298,19 +298,19 @@ cookie of data in the applet window's cookie table. The data in the
 cookie itself is also deleted before it is removed from the table.
 ****************************************************************************/
 bool wxHtmlAppletWindow::UnRegisterCookie(
-	const wxString& name)
+    const wxString& name)
 {
-	wxObject *data = m_Cookies.Delete(name);
+    wxObject *data = m_Cookies.Delete(name);
-	if (data) {
+    if (data) {
-		delete data;
+        delete data;
-		return true;
+        return true;
-		}
+        }
-	return false;
+    return false;
 }
 
 /****************************************************************************
 PARAMETERS:
-msg	- wxEvent message to be sent to all wxApplets
+msg - wxEvent message to be sent to all wxApplets
 
 RETURNS:
 Pointer to the cookie data if found, NULL if not found.
@@ -321,9 +321,9 @@ of data given it's public name. If the cookie is not found, NULL is
 returned.
 ****************************************************************************/
 wxObject *wxHtmlAppletWindow::FindCookie(
-	const wxString& name)
+    const wxString& name)
 {
-	return m_Cookies.Get(name);
+    return m_Cookies.Get(name);
 }
 
 #include "wx/html/m_templ.h"
@@ -338,29 +338,29 @@ TAG_HANDLER_BEGIN(Embed, "EMBED")
 
 TAG_HANDLER_PROC(tag)
 {
-	wxWindow			*wnd;
+    wxWindow            *wnd;
-	wxHtmlAppletWindow	*appletWindow;
+    wxHtmlAppletWindow  *appletWindow;
-	wxApplet			*applet;
+    wxApplet            *applet;
-	int 				width, height;
+    int                 width, height;
-	int 				floatPercent = 0;
+    int                 floatPercent = 0;
 
-	wnd = m_WParser->GetWindow();
+    wnd = m_WParser->GetWindow();
-	if ((appletWindow = wxDynamicCast(wnd,wxHtmlAppletWindow)) != NULL) {
+    if ((appletWindow = wxDynamicCast(wnd,wxHtmlAppletWindow)) != NULL) {
-		tag.ScanParam("WIDTH", "%i", &width);
+        tag.ScanParam("WIDTH", "%i", &width);
-		tag.ScanParam("HEIGHT", "%i", &height);
+        tag.ScanParam("HEIGHT", "%i", &height);
-		if (tag.HasParam("FLOAT"))
+        if (tag.HasParam("FLOAT"))
-			tag.ScanParam("FLOAT", "%i", &floatPercent);
+            tag.ScanParam("FLOAT", "%i", &floatPercent);
-		if (tag.HasParam("APPLET")) {
+        if (tag.HasParam("APPLET")) {
-			if ((applet = appletWindow->CreateApplet(tag.GetParam("APPLET"), wxSize(width, height))) != NULL) {
+            if ((applet = appletWindow->CreateApplet(tag.GetParam("APPLET"), wxSize(width, height))) != NULL) {
-				applet->Show(true);
+                applet->Show(true);
-				m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(applet,floatPercent));
+                m_WParser->OpenContainer()->InsertCell(new wxHtmlWidgetCell(applet,floatPercent));
-				}
+                }
-			}
+            }
-		else if (tag.HasParam("TEXT")) {
+        else if (tag.HasParam("TEXT")) {
-			// TODO: Somehow get the text returned from this class displayed on the page!
+            // TODO: Somehow get the text returned from this class displayed on the page!
-			}
+            }
-		}
+        }
-	return false;
+    return false;
 }
 
 TAG_HANDLER_END(Embed)

contrib/include/wx/applet/applet.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-*						wxWindows HTML Applet Package
+*                       wxWindows HTML Applet Package
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
@@ -23,8 +23,8 @@
 *  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
 *  ======================================================================
 *
-* Language:		ANSI C++
+* Language:     ANSI C++
-* Environment:	Any
+* Environment:  Any
 *
 * Description:  Header file for the wxApplet class
 *
@@ -46,38 +46,38 @@ class wxApplet : public wxPanel {
 private:
     DECLARE_ABSTRACT_CLASS(wxApplet);
     DECLARE_EVENT_TABLE();
-	
+    
 protected:
-	wxHtmlAppletWindow	*m_Parent;
+    wxHtmlAppletWindow  *m_Parent;
 
-			// Special handler for background erase messages 			
+            // Special handler for background erase messages            
-			void OnEraseBackground(wxEraseEvent&);
+            void OnEraseBackground(wxEraseEvent&);
-		
+        
 public:
-			// Constructor (called during dynamic creation)
+            // Constructor (called during dynamic creation)
-			wxApplet() { m_Parent = NULL; }
+            wxApplet() { m_Parent = NULL; }
-	
+    
-			// Psuedo virtual constructor
+            // Psuedo virtual constructor
-	virtual bool Create(
+    virtual bool Create(
-				wxHtmlAppletWindow *parent,
+                wxHtmlAppletWindow *parent,
-				const wxSize& size,
+                const wxSize& size,
-				long style = wxTAB_TRAVERSAL | wxNO_BORDER);
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER);
-				
+                
-			// Virtual destructor
+            // Virtual destructor
-	virtual ~wxApplet();
+    virtual ~wxApplet();
 
-			// Handle HTML navigation to a new URL
+            // Handle HTML navigation to a new URL
-	virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0;	
+    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0; 
-			
+            
-			// Handle HTML navigation forward command in applet
+            // Handle HTML navigation forward command in applet
-	virtual void OnHistoryForward() = 0;
+    virtual void OnHistoryForward() = 0;
-			
+            
-			// Handle HTML navigation back command in applet
+            // Handle HTML navigation back command in applet
-	virtual void OnHistoryBack() = 0;
+    virtual void OnHistoryBack() = 0;
-			
+            
-			// Handle messages from the wxAppletManager and other applets
+            // Handle messages from the wxAppletManager and other applets
-	virtual void OnMessage(wxEvent& msg) = 0;
+    virtual void OnMessage(wxEvent& msg) = 0;
-	};
+    };
-	
+    
 #endif // __WX_APPLET_H
 

contrib/include/wx/applet/window.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 *
-*						wxWindows HTML Applet Package
+*                       wxWindows HTML Applet Package
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
@@ -23,8 +23,8 @@
 *  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
 *  ======================================================================
 *
-* Language:		ANSI C++
+* Language:     ANSI C++
-* Environment:	Any
+* Environment:  Any
 *
 * Description:  Header file for the wxHtmlAppletWindow class
 *
@@ -43,9 +43,9 @@ WX_DECLARE_LIST(wxApplet, wxAppletList);
 
 /****************************************************************************
 MEMBERS:
-appletModules	- List of register applet modules	
+appletModules   - List of register applet modules   
-appletList		- List of all active applets instances
+appletList      - List of all active applets instances
-cookies			- Hash table for managing cookies		
+cookies         - Hash table for managing cookies       
 
 REMARKS:
 Defines the class for wxAppletWindow. This class is derived from the
@@ -56,59 +56,59 @@ class wxHtmlAppletWindow : public wxHtmlWindow {
 private:
     DECLARE_CLASS(wxHtmlAppletWindow);
     DECLARE_EVENT_TABLE();
-	
+    
 protected:
-	wxAppletList	m_AppletList;		
+    wxAppletList    m_AppletList;       
-	wxHashTable		m_Cookies;
+    wxHashTable     m_Cookies;
-		
+        
 public:
-			// Constructor
+            // Constructor
-			wxHtmlAppletWindow(
+            wxHtmlAppletWindow(
-				wxWindow *parent,
+                wxWindow *parent,
-				wxWindowID id = -1,
+                wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
-				const wxSize& size = wxDefaultSize,
+                const wxSize& size = wxDefaultSize,
-				long style = wxHW_SCROLLBAR_AUTO,
+                long style = wxHW_SCROLLBAR_AUTO,
-				const wxString& name = "htmlAppletWindow");
+                const wxString& name = "htmlAppletWindow");
-				
+                
-			// Destructor
+            // Destructor
-			~wxHtmlAppletWindow();
+            ~wxHtmlAppletWindow();
-	
+    
-			// Create an instance of an applet based on it's class name
+            // Create an instance of an applet based on it's class name
-			wxApplet *CreateApplet(
+            wxApplet *CreateApplet(
-				const wxString& className,			
+                const wxString& className,          
-				const wxSize& size);
+                const wxSize& size);
-				
+                
-			// Find an instance of an applet based on it's class name
+            // Find an instance of an applet based on it's class name
-			wxApplet *FindApplet(const wxString& className);			
+            wxApplet *FindApplet(const wxString& className);            
-			
+            
-			// Remove an applet from the window. Called during applet destruction
+            // Remove an applet from the window. Called during applet destruction
-			bool RemoveApplet(const wxApplet *applet);			
+            bool RemoveApplet(const wxApplet *applet);          
 
-			// Load a new URL page
+            // Load a new URL page
-			bool LoadPage(const wxString& hRef);
+            bool LoadPage(const wxString& hRef);
-			
+            
-			// Called when users clicked on hypertext link.
+            // Called when users clicked on hypertext link.
-			void OnLinkClicked(const wxHtmlLinkInfo& link);
+            void OnLinkClicked(const wxHtmlLinkInfo& link);
-			
+            
-			// Handles forward navigation within the HTML stack
+            // Handles forward navigation within the HTML stack
-			bool HistoryForward();
+            bool HistoryForward();
-			
+            
-			// Handles backwards navigation within the HTML stack
+            // Handles backwards navigation within the HTML stack
-			bool HistoryBack();
+            bool HistoryBack();
-			
+            
-			// Broadcast a message to all applets on the page
+            // Broadcast a message to all applets on the page
-			void SendMessage(wxEvent& msg);
+            void SendMessage(wxEvent& msg);
-			
+            
-			// Register a cookie of data in the applet manager
+            // Register a cookie of data in the applet manager
-			bool RegisterCookie(const wxString& name,wxObject *cookie);
+            bool RegisterCookie(const wxString& name,wxObject *cookie);
-			
+            
-			// UnRegister a cookie of data in the applet manager
+            // UnRegister a cookie of data in the applet manager
-			bool UnRegisterCookie(const wxString& name);
+            bool UnRegisterCookie(const wxString& name);
-			
+            
-			// Find a cookie of data given it's public name
+            // Find a cookie of data given it's public name
-			wxObject *FindCookie(const wxString& name);
+            wxObject *FindCookie(const wxString& name);
-	};
+    };
-	
+    
 #endif // __WX_APPLET_WINDOW_H