notebook: switch to underscored naming convention, WM name fix

3 files changed, 51 insertions, 52 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
diff --git a/alf/alfnotebook.cpp b/alf/alfnotebook.cpp
index d08fd74..494cbee 100644
--- a/alf/alfnotebook.cpp
+++ b/alf/alfnotebook.cpp
@@ -1,12 +1,6 @@
 #include "alfpriv.h"
 #include "alfcompat.h"
 
-#define ALF_NB_ADDTAB       (ALF_WM__BASE + 300)
-#define ALF_NB_TABCOUNT     (ALF_WM__BASE + 301)
-#define ALF_NB_GETPANEL     (ALF_WM__BASE + 302)
-#define ALF_NB_GETSELINDEX  (ALF_WM__BASE + 303)
-#define ALF_NB_GETPNLINDEX  (ALF_WM__BASE + 304)
-
 #define TABP_BODY 10
 #define TMT_FILLCOLORHINT 3821
 
@@ -148,7 +142,7 @@ ALF_Notebook_PropagateDpiChange(HWND hwndNotebook, ALFNotebookPriv *priv, WPARAM
 {
     int n = ALF_Notebook_InternalTabCount(hwndNotebook, priv->hwndTabCtrl);
     for (int i = 0; i < n; ++i) {
-        HWND hwndPanel = ALF_NotebookTabPanel(hwndNotebook, i);
+        HWND hwndPanel = ALF_Notebook_TabPanel(hwndNotebook, i);
         SendMessage(hwndPanel, ALF_WM_DPICHANGE, wparam, lparam);
     }
 }
@@ -383,7 +377,7 @@ ALF_Notebook_SetWidgetFlags(HWND hwndNotebook, ALFNotebookPriv *priv, HWND widge
 }
 
 static LRESULT CALLBACK
-ALF__NotebookWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+ALF_Notebook_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     ALFNotebookPriv *priv = (ALFNotebookPriv *)GetWindowLongPtr(hwnd, 0);
 
@@ -502,18 +496,18 @@ ALF__NotebookWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                     && priv->tabPaneBgColor == ALF_COLOR_TRANSPARENT
                     && ((oldR.bottom - oldR.top) != (r.bottom - r.top))) {
                 // only needed when height changes, since bg is tiled horizontally
-                HWND panel = ALF_NotebookSelectedPanel(hwnd);
+                HWND panel = ALF_Notebook_SelectedPanel(hwnd);
                 if (panel != NULL)
                     ALF_InvalidateBackground(panel);
             }
         }
-    } else if (uMsg == ALF_NB_ADDTAB) {
+    } else if (uMsg == ALF_WM_NTBK_ADDTAB) {
         return (LRESULT)ALF_Notebook_InternalAddTab(hwnd, priv, (TCHAR *)lParam);
-    } else if (uMsg == ALF_NB_TABCOUNT) {
+    } else if (uMsg == ALF_WM_NTBK_TABCOUNT) {
         return (LRESULT)ALF_Notebook_InternalTabCount(hwnd, priv->hwndTabCtrl);
-    } else if (uMsg == ALF_NB_GETPANEL) {
+    } else if (uMsg == ALF_WM_NTBK_GETPANEL) {
         return (LRESULT)ALF_Notebook_InternalTabPanel(hwnd, priv->hwndTabCtrl, (int)lParam);
-    } else if (uMsg == ALF_NB_GETSELINDEX) {
+    } else if (uMsg == ALF_WM_NTBK_GETSELINDEX) {
         return (LRESULT)ALF_Notebook_InternalSelectedIndex(hwnd, priv->hwndTabCtrl);
     } else if (uMsg == WM_THEMECHANGED) {
         ALF_Notebook_InternalHandleThemeChange(hwnd, priv);
@@ -567,7 +561,7 @@ ALF_AddNotebook(HWND parent, WORD id, int x, int y)
                                              0, 0, 100, 100,
                                              parent,
                                              (HMENU)(ULONG_PTR)id,
-                                             ALF__NotebookWindowProc,
+                                             ALF_Notebook_WindowProc,
                                              NULL);
 
     ALF_AddWidget(parent, x, y, hwndNtbk, 0, 0, ALF_LAYOUT_SIZE_QUERY | ALF_LAYOUT_INHERITFONT | ALF_LAYOUT_SENDDPICHANGE);
@@ -576,51 +570,51 @@ 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)
 {
-    return (HWND)SendMessage(notebook, ALF_NB_ADDTAB, 0, (LPARAM)title);
+    return (HWND)SendMessage(notebook, ALF_WM_NTBK_ADDTAB, 0, (LPARAM)title);
 }
 
 int
-ALF_NotebookTabCount(HWND notebook)
+ALF_Notebook_TabCount(HWND notebook)
 {
-    return (int)SendMessage(notebook, ALF_NB_TABCOUNT, 0, 0);
+    return (int)SendMessage(notebook, ALF_WM_NTBK_TABCOUNT, 0, 0);
 }
 
 int
-ALF_NotebookTabIndex(HWND notebook, HWND tabPanel);
+ALF_Notebook_TabIndex(HWND notebook, HWND tabPanel);
 
 HWND
-ALF_NotebookTabPanel(HWND notebook, int index)
+ALF_Notebook_TabPanel(HWND notebook, int index)
 {
-    return (HWND)SendMessage(notebook, ALF_NB_GETPANEL, 0, (LPARAM)index);
+    return (HWND)SendMessage(notebook, ALF_WM_NTBK_GETPANEL, 0, (LPARAM)index);
 }
 
 int
-ALF_NotebookSelectedIndex(HWND notebook)
+ALF_Notebook_SelectedIndex(HWND notebook)
 {
-    return (int)SendMessage(notebook, ALF_NB_GETSELINDEX, 0, 0);
+    return (int)SendMessage(notebook, ALF_WM_NTBK_GETSELINDEX, 0, 0);
 }
 
 HWND
-ALF_NotebookSelectedPanel(HWND notebook)
+ALF_Notebook_SelectedPanel(HWND notebook)
 {
-    int i = ALF_NotebookSelectedIndex(notebook);
+    int i = ALF_Notebook_SelectedIndex(notebook);
     if (i >= 0) {
-        return ALF_NotebookTabPanel(notebook, i);
+        return ALF_Notebook_TabPanel(notebook, i);
     } else {
         return NULL;
     }
 }
 
 DWORD
-ALF_NotebookFlags(HWND notebook)
+ALF_Notebook_Flags(HWND notebook)
 {
     return (DWORD)SendMessage(notebook, ALF_WM_NTBK_GETFLAGS, 0, 0);
 }
 
 void
-ALF_NotebookSetFlags(HWND notebook, DWORD flags)
+ALF_Notebook_SetFlags(HWND notebook, DWORD flags)
 {
     SendMessage(notebook, ALF_WM_NTBK_SETFLAGS, 0, (LPARAM)flags);
 }
diff --git a/widgetfactory.cpp b/widgetfactory.cpp
index 021192c..7c63191 100644
--- a/widgetfactory.cpp
+++ b/widgetfactory.cpp
@@ -530,11 +530,11 @@ notebookPanelAttach(void *closure, HWND panel)
     (void)closure;
 
     HWND hwndTab = ALF_AddNotebook(panel, (WORD)-1, 0, 0);
-    HWND hwndTabPanel0 = ALF_NotebookAddTab(hwndTab, TEXT("Notebook Debug"));
-    HWND hwndTabPanel1 = ALF_NotebookAddTab(hwndTab, TEXT("Tab 1"));
-    HWND hwndTabPanel2 = ALF_NotebookAddTab(hwndTab, TEXT("Tab 2"));
-    HWND hwndTabPanel3 = ALF_NotebookAddTab(hwndTab, TEXT("Another tab"));
-    ALF_NotebookAddTab(hwndTab, TEXT("Yet another empty tab"));
+    HWND hwndTabPanel0 = ALF_Notebook_AddTab(hwndTab, TEXT("Notebook Debug"));
+    HWND hwndTabPanel1 = ALF_Notebook_AddTab(hwndTab, TEXT("Tab 1"));
+    HWND hwndTabPanel2 = ALF_Notebook_AddTab(hwndTab, TEXT("Tab 2"));
+    HWND hwndTabPanel3 = ALF_Notebook_AddTab(hwndTab, TEXT("Another tab"));
+    ALF_Notebook_AddTab(hwndTab, TEXT("Yet another empty tab"));
 
     ALF_SetBackgroundColor(hwndTabPanel3, ALF_COLOR_RGB(0, 255, 0));
 
@@ -745,7 +745,7 @@ void (*g_paneInitTable[PANE__MAX])(HWND) = {
 static void
 addPaneToNotebook(HWND hwndNotebook, int paneId)
 {
-    HWND panel = ALF_NotebookAddTab(hwndNotebook, g_paneLabels[paneId]);
+    HWND panel = ALF_Notebook_AddTab(hwndNotebook, g_paneLabels[paneId]);
     g_paneInitTable[paneId](panel);
 }
 
@@ -779,11 +779,11 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid,
     }
     if (control != NULL && sourceid == ID_B_TABBGSOLID) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        ALF_NotebookAddFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND);
+        ALF_Notebook_AddFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND);
     }
     if (control != NULL && sourceid == ID_B_TABBGTEXTURE) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        ALF_NotebookRemoveFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND);
+        ALF_Notebook_RemoveFlag(nb, ALF_NOTEBOOK_SOLID_TAB_BACKGROUND);
     }
 
     if (sourceid == IDM_FILE_CLOSE) {
@@ -792,25 +792,25 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid,
 
     if (sourceid == IDM_BACKGROUND_BLUE) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        HWND panel = ALF_NotebookSelectedPanel(nb);
+        HWND panel = ALF_Notebook_SelectedPanel(nb);
         SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_SOLID_BLUE);
     }
 
     if (sourceid == IDM_BACKGROUND_GREEN) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        HWND panel = ALF_NotebookSelectedPanel(nb);
+        HWND panel = ALF_Notebook_SelectedPanel(nb);
         SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_SOLID_GREEN);
     }
 
     if (sourceid == IDM_BACKGROUND_INHERIT) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        HWND panel = ALF_NotebookSelectedPanel(nb);
+        HWND panel = ALF_Notebook_SelectedPanel(nb);
         SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_INHERIT);
     }
 
     if (sourceid == IDM_BACKGROUND_GRADIENT) {
         HWND nb = ALF_WidgetHwndById(window, ID_NOTEBOOK);
-        HWND panel = ALF_NotebookSelectedPanel(nb);
+        HWND panel = ALF_Notebook_SelectedPanel(nb);
         SendMessage(panel, FM_PANEL_SET_BGMODE, 0, (LPARAM)BG_GRADIENT);
     }