ncurses 5.9 - patch 20111022

[ncurses.git] / c++ / cursesp.cc

diff --git a/c++/cursesp.cc b/c++/cursesp.cc
index 2e6931b1bbc28be1114704d3aa960449fde262ae..9c4eab6954ec5c156df3560dac42c5022a163f22 100644 (file)
--- a/c++/cursesp.cc
+++ b/c++/cursesp.cc
@@ -1,6 +1,6 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************
 // * this is for making emacs happy: -*-Mode: C++;-*-
 /****************************************************************************

- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *
+ * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,18 +29,17 @@
 
 /****************************************************************************
  *   Author: Juergen Pfeifer, 1993, 1997                                    *
 
 /****************************************************************************
  *   Author: Juergen Pfeifer, 1993, 1997                                    *

- *   Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en             *

  ****************************************************************************/
 
 #include "internal.h"
 #include "cursesp.h"
  ****************************************************************************/
 
 #include "internal.h"
 #include "cursesp.h"

-#include <string.h>

 
 

-MODULE_ID("$Id: cursesp.cc,v 1.20 2002/07/13 11:35:08 juergen Exp $")
+MODULE_ID("$Id: cursesp.cc,v 1.25 2005/08/06 22:12:36 tom Exp $")

 
 

-NCursesPanel* NCursesPanel::dummy = (NCursesPanel*)0;
+NCursesPanel* NCursesPanel::dummy = static_cast<NCursesPanel*>(0);

 
 

-void NCursesPanel::init() {
+void NCursesPanel::init()
+{

   p = ::new_panel(w);
   if (!p)
     OnError(ERR);
   p = ::new_panel(w);
   if (!p)
     OnError(ERR);


@@ -49,11 +48,12 @@ void NCursesPanel::init() {
   hook->m_user  = NULL;
   hook->m_back  = this;
   hook->m_owner = p;
   hook->m_user  = NULL;
   hook->m_back  = this;
   hook->m_owner = p;

-  ::set_panel_userptr(p, (void *)hook);
+  ::set_panel_userptr(p, reinterpret_cast<void *>(hook));

 }
 
 }
 

-NCursesPanel::~NCursesPanel() {
-  UserHook* hook = (UserHook*)::panel_userptr(p);
+NCursesPanel::~NCursesPanel()
+{
+  UserHook* hook = UserPointer();

   assert(hook != 0 && hook->m_back==this && hook->m_owner==p);
   delete hook;
   ::del_panel(p);
   assert(hook != 0 && hook->m_back==this && hook->m_owner==p);
   delete hook;
   ::del_panel(p);


@@ -61,7 +61,8 @@ NCursesPanel::~NCursesPanel() {
 }
 
 void
 }
 
 void

-NCursesPanel::redraw() {
+NCursesPanel::redraw()
+{

   PANEL *pan;
 
   pan = ::panel_above(NULL);
   PANEL *pan;
 
   pan = ::panel_above(NULL);


@@ -74,26 +75,30 @@ NCursesPanel::redraw() {
 }
 
 int
 }
 
 int

-NCursesPanel::refresh() {
+NCursesPanel::refresh()
+{

   ::update_panels();
   return ::doupdate();
 }
 
 int
   ::update_panels();
   return ::doupdate();
 }
 
 int

-NCursesPanel::noutrefresh() {
+NCursesPanel::noutrefresh()
+{

   ::update_panels();
   return OK;
 }
 
 void
   ::update_panels();
   return OK;
 }
 
 void

-NCursesPanel::boldframe(const char *title, const char* btitle) {
+NCursesPanel::boldframe(const char *title, const char* btitle)
+{

   standout();
   frame(title, btitle);
   standend();
 }
 
 void
   standout();
   frame(title, btitle);
   standend();
 }
 
 void

-NCursesPanel::frame(const char *title,const char *btitle) {
+NCursesPanel::frame(const char *title,const char *btitle)
+{

   int err = OK;
   if (!title && !btitle) {
     err = box();
   int err = OK;
   if (!title && !btitle) {
     err = box();


@@ -107,7 +112,8 @@ NCursesPanel::frame(const char *title,const char *btitle) {
 }
 
 void
 }
 
 void

-NCursesPanel::label(const char *tLabel, const char *bLabel) {
+NCursesPanel::label(const char *tLabel, const char *bLabel)
+{

   if (tLabel)
     centertext(0,tLabel);
   if (bLabel)
   if (tLabel)
     centertext(0,tLabel);
   if (bLabel)


@@ -115,16 +121,18 @@ NCursesPanel::label(const char *tLabel, const char *bLabel) {
 }
 
 void
 }
 
 void

-NCursesPanel::centertext(int row,const char *label) {
-  if (label) {
-    int x = (maxx() - ::strlen(label)) / 2;
+NCursesPanel::centertext(int row,const char *labelText)
+{
+  if (labelText) {
+    int x = (maxx() - ::strlen(labelText)) / 2;

     if (x<0)
       x=0;
     if (x<0)
       x=0;

-    OnError(addstr(row, x, label, width()));
+    OnError(addstr(row, x, labelText, width()));

   }
 }
 
 int
   }
 }
 
 int

-NCursesPanel::getKey(void) {
+NCursesPanel::getKey(void)
+{

   return getch();
 }
   return getch();
 }