X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=c%2B%2B%2Fdemo.cc;h=195e98a0d6de9bcc44d190ef2d870e307a6ae138;hb=ad14e224ecf8bc5e6faeffeecd44c3cfa31827e4;hp=d99052cb09c87873b6938197d00d077014b622e8;hpb=cf6a62567b2365c8678b7d561845bdbd1739e5da;p=ncurses.git diff --git a/c++/demo.cc b/c++/demo.cc index d99052cb..195e98a0 100644 --- a/c++/demo.cc +++ b/c++/demo.cc @@ -1,6 +1,6 @@ // * This makes emacs happy -*-Mode: C++;-*- /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2020,2021 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -36,7 +36,7 @@ * Demo code for NCursesMenu and NCursesForm written by * Juergen Pfeifer * - * $Id: demo.cc,v 1.47 2020/07/18 19:57:11 anonymous.maarten Exp $ + * $Id: demo.cc,v 1.50 2021/09/04 10:52:55 tom Exp $ */ #include "internal.h" @@ -44,11 +44,10 @@ #include "cursesm.h" #include "cursesf.h" -#ifdef _WIN32 +#if (defined(_WIN32) || defined(_WIN64)) #undef KEY_EVENT -#endif - -#ifndef _WIN32 +#define sleep(n) Sleep(n) +#else extern "C" unsigned int sleep(unsigned int); #endif @@ -105,7 +104,7 @@ class SillyDemo } // A refresh to any valid panel updates all panels and refreshes - // the screen. Using mystd is just convenient - We know it's always + // the screen. Using mystd is just convenient - We know it is always // valid until the end of the program. mystd->refresh(); @@ -570,7 +569,7 @@ int TestApplication::run() // static TestApplication *Demo = new TestApplication(); -#ifdef _WIN32 +#if (defined(_WIN32) || defined(_WIN64)) // This is actually only needed when ncurses is a dll NCURSES_CXX_MAIN #endif