diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 12:36:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-02 12:36:00 +0400 |
commit | e9e9f89f1a3f968b3c3c32677e1b7ff2b72c2c0f (patch) | |
tree | 510c373e11faf46ec67bee98c1a55cd39ded1149 | |
parent | d197ec74e31c0a90b440246e5c48dd0644055740 (diff) |
x11 builds again.
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e2ee7044392..63fc1f3c67f 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1492,3 +1492,9 @@ void GHOST_SystemX11::putClipboard(GHOST_TInt8 *buffer, bool selection) const } +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 d0e72659517..58398975e5d 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -227,6 +227,8 @@ public: */ void putClipboard(GHOST_TInt8 *buffer, bool selection) const; + int toggleConsole(int action); /* dummy */ + /** * Atom used for ICCCM, WM-spec and Motif. * We only need get this atom at the start, it's relative diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index fd39755607f..534e1f219f6 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2030,7 +2030,7 @@ static void WM_OT_quit_blender(wmOperatorType *ot) /* *********************** */ -static int wm_console_toggle_op(bContext *C, wmOperator *UNUSED(op)) +static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op)) { GHOST_toggleConsole(2); return OPERATOR_FINISHED; |