notebook: switch to underscored naming convention, WM name fix

1 files changed, 17 insertions, 12 deletions

diff --git a/alf/alf.h b/alf/alf.h
index 321a56c..6183b58 100644
--- a/alf/alf.h
+++ b/alf/alf.h
@@ -121,6 +121,11 @@ typedef struct {
 
 #define ALF_WM_NTBK_GETFLAGS    (ALF_WM__BASE + 201)
 #define ALF_WM_NTBK_SETFLAGS    (ALF_WM__BASE + 202)
+#define ALF_WM_NTBK_ADDTAB      (ALF_WM__BASE + 203)
+#define ALF_WM_NTBK_TABCOUNT    (ALF_WM__BASE + 204)
+#define ALF_WM_NTBK_GETPANEL    (ALF_WM__BASE + 205)
+#define ALF_WM_NTBK_GETSELINDEX (ALF_WM__BASE + 206)
+#define ALF_WM_NTBK_GETPNLINDEX (ALF_WM__BASE + 207)
 
 #define ALF_WM_USER             (ALF_WM__BASE + 300)
 
@@ -522,37 +527,37 @@ HWND
 ALF_AddNotebook(HWND parent, WORD id, int x, int y);
 
 HWND
-ALF_NotebookAddTab(HWND notebook, const TCHAR *title);
+ALF_Notebook_AddTab(HWND notebook, const TCHAR *title);
 
 int
-ALF_NotebookTabCount(HWND notebook);
+ALF_Notebook_TabCount(HWND notebook);
 
 int
-ALF_NotebookTabIndex(HWND notebook, HWND tabPanel);
+ALF_Notebook_TabIndex(HWND notebook, HWND tabPanel);
 
 int
-ALF_NotebookSelectedIndex(HWND notebook);
+ALF_Notebook_SelectedIndex(HWND notebook);
 
 HWND
-ALF_NotebookSelectedPanel(HWND notebook);
+ALF_Notebook_SelectedPanel(HWND notebook);
 
 HWND
-ALF_NotebookTabPanel(HWND notebook, int index);
+ALF_Notebook_TabPanel(HWND notebook, int index);
 
 DWORD
-ALF_NotebookFlags(HWND notebook);
+ALF_Notebook_Flags(HWND notebook);
 
 void
-ALF_NotebookSetFlags(HWND notebook, DWORD flags);
+ALF_Notebook_SetFlags(HWND notebook, DWORD flags);
 
 static inline void
-ALF_NotebookAddFlag(HWND notebook, DWORD flag) {
-    ALF_NotebookSetFlags(notebook, ALF_NotebookFlags(notebook) | flag);
+ALF_Notebook_AddFlag(HWND notebook, DWORD flag) {
+    ALF_Notebook_SetFlags(notebook, ALF_Notebook_Flags(notebook) | flag);
 }
 
 static inline void
-ALF_NotebookRemoveFlag(HWND notebook, DWORD flag) {
-    ALF_NotebookSetFlags(notebook, ALF_NotebookFlags(notebook) & ~flag);
+ALF_Notebook_RemoveFlag(HWND notebook, DWORD flag) {
+    ALF_Notebook_SetFlags(notebook, ALF_Notebook_Flags(notebook) & ~flag);
 }
 
 // checkbox