combo: switch to naming convention with underscores

3 files changed, 33 insertions, 33 deletions

diff --git a/alf/alf.h b/alf/alf.h
index 2399569..044fa9e 100644
--- a/alf/alf.h
+++ b/alf/alf.h
@@ -475,28 +475,28 @@ HWND
 ALF_AddSelectionOnlyComboBox(HWND win, WORD id, int x, int y);
 
 int /* index */
-ALF_ComboBoxAddString(HWND combo, const TCHAR *text);
+ALF_ComboBox_AddString(HWND combo, const TCHAR *text);
 
 void
-ALF_ComboBoxInsertString(HWND combo, int index, const TCHAR *text);
+ALF_ComboBox_InsertString(HWND combo, int index, const TCHAR *text);
 
 void
-ALF_ComboBoxRemoveString(HWND combo, int index);
+ALF_ComboBox_RemoveString(HWND combo, int index);
 
 TCHAR * // free with ALF_Free
-ALF_ComboBoxStringForIndex(HWND combo, int index);
+ALF_ComboBox_StringForIndex(HWND combo, int index);
 
 int
-ALF_ComboBoxCurrentIndex(HWND combo);
+ALF_ComboBox_CurrentIndex(HWND combo);
 
 void
-ALF_ComboBoxSetCurrentIndex(HWND combo, int index);
+ALF_ComboBox_SetCurrentIndex(HWND combo, int index);
 
 TCHAR * // free with ALF_Free
-ALF_ComboBoxCurrentText(HWND combo);
+ALF_ComboBox_CurrentText(HWND combo);
 
 void
-ALF_ComboBoxSetText(HWND combo, const TCHAR *text);
+ALF_ComboBox_SetText(HWND combo, const TCHAR *text);
 
 // panel
 HWND
diff --git a/alf/alfcombobox.cpp b/alf/alfcombobox.cpp
index 86ba4ea..1a7c1c2 100644
--- a/alf/alfcombobox.cpp
+++ b/alf/alfcombobox.cpp
@@ -48,7 +48,7 @@ ALF_Combo_FreePriv(ALFComboPriv *priv)
 }
 
 static int
-ALF__ComboItemHeight(HWND hwnd)
+ALF_Combo_ItemHeight(HWND hwnd)
 {
     int height = 0;
     HDC hDc = GetDC(hwnd);
@@ -69,7 +69,7 @@ ALF__ComboItemHeight(HWND hwnd)
 }
 
 static LRESULT CALLBACK
-ALF__ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+ALF_Combo_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     ALFComboPriv *priv = (ALFComboPriv *)GetWindowLongPtr(hwnd, 0);
 
@@ -102,7 +102,7 @@ ALF__ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     }
     if (uMsg == WM_SETFONT && priv) {
         SendMessage(priv->hwndChild, WM_SETFONT, wParam, lParam);
-        SendMessage(priv->hwndChild, CB_SETITEMHEIGHT, (WPARAM)0, (LPARAM)ALF__ComboItemHeight(hwnd));
+        SendMessage(priv->hwndChild, CB_SETITEMHEIGHT, (WPARAM)0, (LPARAM)ALF_Combo_ItemHeight(hwnd));
 
         ALF_InvalidateLayout(GetParent(hwnd));
 
@@ -184,7 +184,7 @@ ALF__ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
     if (uMsg == WM_MEASUREITEM) {
         PMEASUREITEMSTRUCT lpmis = (LPMEASUREITEMSTRUCT) lParam;
 
-        lpmis->itemHeight = (UINT)ALF__ComboItemHeight(hwnd);
+        lpmis->itemHeight = (UINT)ALF_Combo_ItemHeight(hwnd);
 
         return TRUE;
     }
@@ -259,7 +259,7 @@ ALF__ComboWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
             }
 
             SendMessage(priv->hwndChild, CB_SETITEMHEIGHT, (WPARAM)-1, pos->cy + heightOffset);
-            SendMessage(priv->hwndChild, CB_SETITEMHEIGHT, (WPARAM)0, (LPARAM)ALF__ComboItemHeight(hwnd));
+            SendMessage(priv->hwndChild, CB_SETITEMHEIGHT, (WPARAM)0, (LPARAM)ALF_Combo_ItemHeight(hwnd));
         }
     }
 
@@ -313,7 +313,7 @@ ALF_InternalAddComboBox(HWND win, WORD id, int x, int y, DWORD style, const TCHA
                                              0, 0, 0, 0,
                                              win,
                                              (HMENU)(ULONG_PTR)id,
-                                             ALF__ComboWindowProc,
+                                             ALF_Combo_WindowProc,
                                              &cp);
 
     if (defaultText)
@@ -337,19 +337,19 @@ ALF_AddSelectionOnlyComboBox(HWND win, WORD id, int x, int y)
 }
 
 int /* index */
-ALF_ComboBoxAddString(HWND combo, const TCHAR *text)
+ALF_ComboBox_AddString(HWND combo, const TCHAR *text)
 {
     return (int)SendMessage(combo, ALF_CB_ADDSTRING, 0, (LPARAM)text);
 }
 
 TCHAR *
-ALF_ComboBoxCurrentText(HWND combo)
+ALF_ComboBox_CurrentText(HWND combo)
 {
     LRESULT style = SendMessage(combo, ALF_CB_GETSTYLE, 0, 0);
     if (style & CBS_DROPDOWNLIST) {
-        int i = ALF_ComboBoxCurrentIndex(combo);
+        int i = ALF_ComboBox_CurrentIndex(combo);
         if (i >= 0) {
-            return ALF_ComboBoxStringForIndex(combo, i);
+            return ALF_ComboBox_StringForIndex(combo, i);
         }
     }
 
@@ -357,7 +357,7 @@ ALF_ComboBoxCurrentText(HWND combo)
 }
 
 void
-ALF_ComboBoxSetText(HWND combo, const TCHAR *text)
+ALF_ComboBox_SetText(HWND combo, const TCHAR *text)
 {
     LRESULT index = SendMessage(combo, ALF_CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)text);
     if (index >= 0) {
@@ -368,19 +368,19 @@ ALF_ComboBoxSetText(HWND combo, const TCHAR *text)
 }
 
 int
-ALF_ComboBoxCurrentIndex(HWND combo)
+ALF_ComboBox_CurrentIndex(HWND combo)
 {
     return (int)SendMessage(combo, ALF_CB_GETCURSEL, 0, 0);
 }
 
 void
-ALF_ComboBoxSetCurrentIndex(HWND combo, int index)
+ALF_ComboBox_SetCurrentIndex(HWND combo, int index)
 {
     SendMessage(combo, ALF_CB_SETCURSEL, (WPARAM)index, 0);
 }
 
 TCHAR * // free with ALF_Free
-ALF_ComboBoxStringForIndex(HWND combo, int index)
+ALF_ComboBox_StringForIndex(HWND combo, int index)
 {
     int len = (int)SendMessage(combo, ALF_CB_GETLBTEXTLEN, (WPARAM)index, 0);
     if (len > 0) {
@@ -396,13 +396,13 @@ ALF_ComboBoxStringForIndex(HWND combo, int index)
 }
 
 void
-ALF_ComboBoxInsertString(HWND combo, int index, const TCHAR *text)
+ALF_ComboBox_InsertString(HWND combo, int index, const TCHAR *text)
 {
     SendMessage(combo, ALF_CB_INSERTSTRING, (WPARAM)index, (LPARAM)text);
 }
 
 void
-ALF_ComboBoxRemoveString(HWND combo, int index)
+ALF_ComboBox_RemoveString(HWND combo, int index)
 {
     SendMessage(combo, ALF_CB_DELETESTRING, (WPARAM)index, 0);
 }
diff --git a/widgetfactory.cpp b/widgetfactory.cpp
index bced64a..acb9358 100644
--- a/widgetfactory.cpp
+++ b/widgetfactory.cpp
@@ -479,21 +479,21 @@ comboPanelAttach(void *closure, HWND panel)
     ALF_AddLabel(panel, (WORD)-1, 0, 2, TEXT("&Editable Combo Box:"));
     HWND hwndCombo1 = ALF_AddEditableComboBox(panel, ID_COMBO1, 2, 2, TEXT("Hello!"));
 
-    ALF_ComboBoxInsertString(hwndCombo1, 0, TEXT("Hello World!"));
-    ALF_ComboBoxInsertString(hwndCombo1, -1, TEXT("Goodbye World!"));
-    ALF_ComboBoxInsertString(hwndCombo1, 1, TEXT("The quick brown fox jumps over the lazy dog"));
+    ALF_ComboBox_InsertString(hwndCombo1, 0, TEXT("Hello World!"));
+    ALF_ComboBox_InsertString(hwndCombo1, -1, TEXT("Goodbye World!"));
+    ALF_ComboBox_InsertString(hwndCombo1, 1, TEXT("The quick brown fox jumps over the lazy dog"));
 
     ALF_AddLabel(panel, (WORD)-1, 0, 4, TEXT("Selection-Only Combo Box:"));
     HWND hwndCombo2 = ALF_AddSelectionOnlyComboBox(panel, ID_COMBO2, 2, 4);
     ALF_AddButton(panel, ID_BTNCOMBOCLEAR, 4, 4, TEXT("Clear"));
 
-    ALF_ComboBoxAddString(hwndCombo2, TEXT("Hello World!"));
-    ALF_ComboBoxAddString(hwndCombo2, TEXT("Goodbye World!"));
-    ALF_ComboBoxAddString(hwndCombo2, TEXT("The quick brown fox jumps over the lazy dog"));
+    ALF_ComboBox_AddString(hwndCombo2, TEXT("Hello World!"));
+    ALF_ComboBox_AddString(hwndCombo2, TEXT("Goodbye World!"));
+    ALF_ComboBox_AddString(hwndCombo2, TEXT("The quick brown fox jumps over the lazy dog"));
 
     ALF_AddLabel(panel, ID_LBLCOMBOTEXT, 2, 6, TEXT("[ComboBox2 value]"));
 
-    ALF_ComboBoxSetText(hwndCombo2, TEXT("Goodbye World!"));
+    ALF_ComboBox_SetText(hwndCombo2, TEXT("Goodbye World!"));
 
     ALF_LayoutSetRowMinSize(panel, 1, 825);
     ALF_LayoutSetRowMinSize(panel, 3, 825);
@@ -764,7 +764,7 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid,
     (void)closure;
 
     if (notificationcode == CBN_SELCHANGE && sourceid == ID_COMBO2) {
-        TCHAR *text = ALF_ComboBoxCurrentText(control);
+        TCHAR *text = ALF_ComboBox_CurrentText(control);
 
         ALF_SetWidgetText(window, ID_LBLCOMBOTEXT, text);
 
@@ -772,7 +772,7 @@ handleCommand(void *closure, HWND window, WORD notificationcode, WORD sourceid,
     }
     if (control != NULL && sourceid == ID_BTNCOMBOCLEAR) {
         HWND combo = ALF_WidgetHwndById(window, ID_COMBO2);
-        ALF_ComboBoxSetCurrentIndex(combo, -1);
+        ALF_ComboBox_SetCurrentIndex(combo, -1);
     }
     if (sourceid == ID_HELLO) {
         ALF_MessageBox(window, TEXT("Hello World!"), TEXT("Hello"), MB_ICONASTERISK|MB_OK);