define hacks and such for the dec compiler
This commit is contained in:
parent
da17f30cb5
commit
572e5146f8
|
@ -241,9 +241,9 @@ void cmCursesMainForm::PrintKeys()
|
||||||
sprintf(firstLine, "C)onfigure G)enerate and Exit");
|
sprintf(firstLine, "C)onfigure G)enerate and Exit");
|
||||||
sprintf(secondLine, "Q)uit H)elp");
|
sprintf(secondLine, "Q)uit H)elp");
|
||||||
|
|
||||||
move(y-2,0);
|
curses_move(y-2,0);
|
||||||
printw(firstLine);
|
printw(firstLine);
|
||||||
move(y-1,0);
|
curses_move(y-1,0);
|
||||||
printw(secondLine);
|
printw(secondLine);
|
||||||
pos_form_cursor(m_Form);
|
pos_form_cursor(m_Form);
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ void cmCursesMainForm::UpdateStatusBar()
|
||||||
if ( x < cmCursesMainForm::MIN_WIDTH ||
|
if ( x < cmCursesMainForm::MIN_WIDTH ||
|
||||||
y < cmCursesMainForm::MIN_HEIGHT )
|
y < cmCursesMainForm::MIN_HEIGHT )
|
||||||
{
|
{
|
||||||
move(0,0);
|
curses_move(0,0);
|
||||||
printw("Window is too small. A size of at least %dx%d is required.",
|
printw("Window is too small. A size of at least %dx%d is required.",
|
||||||
cmCursesMainForm::MIN_WIDTH, cmCursesMainForm::MIN_HEIGHT);
|
cmCursesMainForm::MIN_WIDTH, cmCursesMainForm::MIN_HEIGHT);
|
||||||
touchwin(m_Window);
|
touchwin(m_Window);
|
||||||
|
@ -310,7 +310,7 @@ void cmCursesMainForm::UpdateStatusBar()
|
||||||
bar[cmCursesMainForm::MAX_WIDTH-1] = '\0';
|
bar[cmCursesMainForm::MAX_WIDTH-1] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
move(y-3,0);
|
curses_move(y-3,0);
|
||||||
attron(A_STANDOUT);
|
attron(A_STANDOUT);
|
||||||
printw(bar);
|
printw(bar);
|
||||||
attroff(A_STANDOUT);
|
attroff(A_STANDOUT);
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#ifndef cmCursesStandardIncludes_h
|
||||||
|
#define cmCursesStandardIncludes_h
|
||||||
#if defined(__sun__) && defined(__GNUC__)
|
#if defined(__sun__) && defined(__GNUC__)
|
||||||
#define _MSE_INT_H
|
#define _MSE_INT_H
|
||||||
#endif
|
#endif
|
||||||
|
@ -19,3 +21,16 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
// on some machines move erase and clear conflict with stl
|
||||||
|
// so remove them from the namespace
|
||||||
|
inline void curses_move(unsigned int x, unsigned int y)
|
||||||
|
{
|
||||||
|
move(x,y);
|
||||||
|
}
|
||||||
|
|
||||||
|
#undef move
|
||||||
|
#undef erase
|
||||||
|
#undef clear
|
||||||
|
|
||||||
|
|
||||||
|
#endif // cmCursesStandardIncludes_h
|
||||||
|
|
|
@ -102,12 +102,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
# if (_COMPILER_VERSION >= 730)
|
# if (_COMPILER_VERSION >= 730)
|
||||||
# define CM_SGI_CC_730
|
# define CM_SGI_CC_730
|
||||||
# elif (_COMPILER_VERSION >= 720)
|
# elif (_COMPILER_VERSION >= 720)
|
||||||
# define CM_SGI_CC_720
|
# define CM_HAS_STD_BUT_NOT_FOR_IOSTREAM
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# ifdef CM_SGI_CC_720
|
#ifdef __DECCXX_VER
|
||||||
// the 720 sgi compiler has std:: but not for the stream library,
|
# if __DECCXX_VER <= 60390002
|
||||||
|
# define CM_HAS_STD_BUT_NOT_FOR_IOSTREAM
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CM_HAS_STD_BUT_NOT_FOR_IOSTREAM
|
||||||
|
// some compilers have std:: but not for the stream library,
|
||||||
// so we have to bring it into the std namespace by hand.
|
// so we have to bring it into the std namespace by hand.
|
||||||
namespace std {
|
namespace std {
|
||||||
using ::ostream;
|
using ::ostream;
|
||||||
|
|
Loading…
Reference in New Issue