ncurses 6.2 - patch 20210626

[ncurses.git] / c++ / cursslk.h

diff --git a/c++/cursslk.h b/c++/cursslk.h
index 6451d4405e933862e20938ae12916a97550070a6..66564fe3a479d0d09626f5a8dd03e1fea0889ccf 100644 (file)
--- a/c++/cursslk.h
+++ b/c++/cursslk.h
@@ -1,6 +1,7 @@
 // * this is for making emacs happy: -*-Mode: C++;-*-
 // * this is for making emacs happy: -*-Mode: C++;-*-

+// vile:cppmode

 /****************************************************************************
 /****************************************************************************

- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2021 Thomas E. Dickey                                *

  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * Copyright 1998-2003,2005 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *


@@ -32,17 +33,17 @@
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 
  *   Author: Juergen Pfeifer, 1997                                          *
  ****************************************************************************/
 

-// $Id: cursslk.h,v 1.16 2020/02/29 15:46:00 anonymous.maarten Exp $
+// $Id: cursslk.h,v 1.19 2021/04/17 18:11:08 tom Exp $

 
 #ifndef NCURSES_CURSSLK_H_incl
 #define NCURSES_CURSSLK_H_incl
 
 #include <cursesw.h>
 
 
 #ifndef NCURSES_CURSSLK_H_incl
 #define NCURSES_CURSSLK_H_incl
 
 #include <cursesw.h>
 

-class NCURSES_IMPEXP Soft_Label_Key_Set {
+class NCURSES_CXX_IMPEXP Soft_Label_Key_Set {

 public:
   // This inner class represents the attributes of a Soft Label Key (SLK)
 public:
   // This inner class represents the attributes of a Soft Label Key (SLK)

-  class NCURSES_IMPEXP Soft_Label_Key {
+  class NCURSES_CXX_IMPEXP Soft_Label_Key {

     friend class Soft_Label_Key_Set;
   public:
     typedef enum { Left=0, Center=1, Right=2 } Justification;
     friend class Soft_Label_Key_Set;
   public:
     typedef enum { Left=0, Center=1, Right=2 } Justification;


@@ -140,7 +141,7 @@ public:
   // You must create a Soft_Label_Key_Set before you create any object of
   // the NCursesWindow, NCursesPanel or derived classes. (Actually before
   // ::initscr() is called).
   // You must create a Soft_Label_Key_Set before you create any object of
   // the NCursesWindow, NCursesPanel or derived classes. (Actually before
   // ::initscr() is called).

-  Soft_Label_Key_Set(Label_Layout fmt);
+  explicit Soft_Label_Key_Set(Label_Layout fmt);

 
   // This constructor assumes, that you already constructed a Key Set
   // with a layout by the constructor above. This layout will be reused.
 
   // This constructor assumes, that you already constructed a Key Set
   // with a layout by the constructor above. This layout will be reused.


@@ -168,7 +169,7 @@ public:
   Soft_Label_Key& operator[](int i);
 
   // Retrieve number of Labels
   Soft_Label_Key& operator[](int i);
 
   // Retrieve number of Labels

-  inline int labels() const { return num_labels; }
+  int labels() const;

 
   // Refresh the SLK portion of the screen
   inline void refresh() {
 
   // Refresh the SLK portion of the screen
   inline void refresh() {