[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36457] trunk/blender/intern/ghost/intern: change ghost/x11 toggleConsole to use dummy function in the header.

Campbell Barton ideasman42 at gmail.com
Tue May 3 09:05:02 CEST 2011


Revision: 36457
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36457
Author:   campbellbarton
Date:     2011-05-03 07:05:01 +0000 (Tue, 03 May 2011)
Log Message:
-----------
change ghost/x11 toggleConsole to use dummy function in the header.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.h

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-03 05:41:16 UTC (rev 36456)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-03 07:05:01 UTC (rev 36457)
@@ -1485,16 +1485,8 @@
 			txt_select_buffer = (char*) malloc(strlen(buffer)+1);
 			strcpy(txt_select_buffer, buffer);
 		}
-	
+
 		if (owner != m_window)
 			fprintf(stderr, "failed to own primary\n");
 	}
 }
-
-
-int GHOST_SystemX11::toggleConsole(int action)
-{
-	/* do nothing */
-	(void)action;
-	return 0;
-}

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.h	2011-05-03 05:41:16 UTC (rev 36456)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.h	2011-05-03 07:05:01 UTC (rev 36457)
@@ -227,7 +227,10 @@
 	 */
 	void putClipboard(GHOST_TInt8 *buffer, bool selection) const;
 
-	int toggleConsole(int action); /* dummy */
+	/**
+	 * @see GHOST_ISystem
+	 */
+	int toggleConsole(int action) { return 0; }
 
 	/**
 	 * Atom used for ICCCM, WM-spec and Motif.




More information about the Bf-blender-cvs mailing list