Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-05-03 11:05:01 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-05-03 11:05:01 +0400
commit08a914095e75ee7b45b7f188e0db9f87c10b480c (patch)
treed4a00ce8ef56a98eb32fe45afea106288df6a36f
parente601dee16805cc8f83680e82d2935d65765be8bf (diff)
change ghost/x11 toggleConsole to use dummy function in the header.
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp10
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.h5
2 files changed, 5 insertions, 10 deletions
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.