From 08a914095e75ee7b45b7f188e0db9f87c10b480c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 May 2011 07:05:01 +0000 Subject: change ghost/x11 toggleConsole to use dummy function in the header. --- intern/ghost/intern/GHOST_SystemX11.cpp | 10 +--------- intern/ghost/intern/GHOST_SystemX11.h | 5 ++++- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 63fc1f3c67f..378bc6b90be 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1485,16 +1485,8 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const 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; -} diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 58398975e5d..0b001273634 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -227,7 +227,10 @@ public: */ 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. -- cgit v1.2.3