aui: rename symbol to be more consistent

winspool · Jul 23, 2024 · 1a7d031 · 1a7d031
1 parent d254a0b
commit 1a7d031
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 18 deletions.
diff --git a/bld/aui/c/dlgsrch.c b/bld/aui/c/dlgsrch.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -235,7 +236,7 @@ static bool SrchGUIEventProc( gui_window *gui, gui_event gui_ev, void *param )
             GUICloseDialog( gui );
             return( true );
         case CTL_SRCH_EDIT_RX:
-            ResDlgOpen( &RXGUIEventProc, NULL, DIALOG_RX );
+            DlgOpenRes( &RXGUIEventProc, NULL, DIALOG_RX );
             return( true );
         case CTL_SRCH_PREV:
             dlg->direction = -1;
@@ -268,7 +269,7 @@ static int DoDlgSearch( a_window wnd, void *history, bool want_prev )
     dlg->case_ignore = SrchIgnoreCase;
     dlg->use_rx = SrchRX;
     dlg->history = history;
-    ResDlgOpen( &SrchGUIEventProc, dlg, want_prev ? DIALOG_SEARCH : DIALOG_SEARCH_ALL );
+    DlgOpenRes( &SrchGUIEventProc, dlg, want_prev ? DIALOG_SEARCH : DIALOG_SEARCH_ALL );
     direction = dlg->direction;
     SrchRX = dlg->use_rx;
     SrchIgnoreCase = dlg->case_ignore;

diff --git a/bld/aui/c/wnddlg.c b/bld/aui/c/wnddlg.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -100,7 +100,7 @@ static gui_create_info ResDialog = {
     NULL                            // Menu Resource
 };
 
-void ResDlgOpen( GUICALLBACK *gui_call_back, void *extra, int dlg_id )
+void DlgOpenRes( GUICALLBACK *gui_call_back, void *extra, int dlg_id )
 {
     ResDialog.parent = DlgOpenGetGUIParent();
     dlgGUIEventProcs[Nested + 1] = gui_call_back;

diff --git a/bld/aui/h/aui.h b/bld/aui/h/aui.h
@@ -302,7 +302,7 @@ extern bool                 DlgNew( const char *title, char *buff, size_t buff_l
 extern bool                 DlgNewWithCtl( const char *title, char *buff, size_t buff_len, gui_control_info *controls, int num_controls,
                                             GUICALLBACK *gui_call_back, gui_text_ord rows, gui_text_ord cols, gui_text_ord max_cols );
 extern void                 DlgOpen( const char *title, gui_text_ord, gui_text_ord, gui_control_info *, int, GUICALLBACK *, void * );
-extern void                 ResDlgOpen( GUICALLBACK *, void *, int dlg_id );
+extern void                 DlgOpenRes( GUICALLBACK *, void *, int dlg_id );
 extern int                  DlgGetFileName( open_file_name *ofn );
 extern bool                 DlgFileBrowse( char *title, char *filter, char *path, unsigned len, fn_flags flags );
 extern int                  DlgSearch( a_window wnd, void *history );

diff --git a/bld/aui/sample/c/dlgoptn.c b/bld/aui/sample/c/dlgoptn.c
@@ -90,6 +90,6 @@ bool    DlgOptions( void )
     dlg_window_set      optset;
 
     optset.cancel = true;
-    ResDlgOpen( &OptSetGUIEventProc, &optset, DLG_OPTIONS );
+    DlgOpenRes( &OptSetGUIEventProc, &optset, DLG_OPTIONS );
     return( !optset.cancel );
 }
diff --git a/bld/wv/c/dlgambig.c b/bld/wv/c/dlgambig.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -52,7 +53,7 @@ static bool SymPick( const char *text, GUIPICKCALLBACK *pick_call_back, int *cho
 
     dlg.func = pick_call_back;
     dlg.choice = -1;
-    ResDlgOpen( GUIPickGUIEventProc, &dlg, DIALOG_AMBIG );
+    DlgOpenRes( GUIPickGUIEventProc, &dlg, DIALOG_AMBIG );
     if( dlg.choice == -1 )
         return( false );
     *choice = dlg.choice;

diff --git a/bld/wv/c/dlgasync.c b/bld/wv/c/dlgasync.c
@@ -97,6 +97,6 @@ static bool AsyncGUIEventProc( gui_window *gui, gui_event gui_ev, void *param )
 
 unsigned DlgAsyncRun( void )
 {
-    ResDlgOpen( AsyncGUIEventProc, 0, DIALOG_ASYNC_RUN );
+    DlgOpenRes( AsyncGUIEventProc, 0, DIALOG_ASYNC_RUN );
     return( dlg.cond );
 }
diff --git a/bld/wv/c/dlgayn.c b/bld/wv/c/dlgayn.c
@@ -80,6 +80,6 @@ bool DlgAreYouNuts( unsigned long mult )
 
     ayn.as_a_fruitcake = false;
     ayn.mult = mult;
-    ResDlgOpen( AynGUIEventProc, &ayn, DIALOG_AYN );
+    DlgOpenRes( AynGUIEventProc, &ayn, DIALOG_AYN );
     return( ayn.as_a_fruitcake );
 }
diff --git a/bld/wv/c/dlgbreak.c b/bld/wv/c/dlgbreak.c
@@ -353,7 +353,7 @@ bool DlgBreak( address addr )
     }
     dlg.tmpbp = *bp;
     CnvULongDec( bp->index, StrCopyDst( " ", StrCopyDst( LIT_DUI( DlgBreak ), TxtBuff ) ), TXT_LEN );
-    ResDlgOpen( BrkGUIEventProc, &dlg, DIALOG_BREAK );
+    DlgOpenRes( BrkGUIEventProc, &dlg, DIALOG_BREAK );
     SetRecord( true );
     return( !dlg.cancel );
 }
diff --git a/bld/wv/c/dlgcmd.c b/bld/wv/c/dlgcmd.c
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2024      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -180,5 +181,5 @@ void    DlgCmd( void )
     dlg_command *dlg;
 
     dlg = WndMustAlloc( sizeof( dlg_command ) );
-    ResDlgOpen( CmdGUIEventProc, dlg, DIALOG_CMD );
+    DlgOpenRes( CmdGUIEventProc, dlg, DIALOG_CMD );
 }
diff --git a/bld/wv/c/dlglist.c b/bld/wv/c/dlglist.c
@@ -171,5 +171,5 @@ void DlgList( const char *title, void (*clear)(void), void (*add)(const char *,u
     dlg.next = next;
     dlg.name = name;
     dlg.title = DupStr( title );
-    ResDlgOpen( SourceGUIEventProc, &dlg, DIALOG_LIST );
+    DlgOpenRes( SourceGUIEventProc, &dlg, DIALOG_LIST );
 }
diff --git a/bld/wv/c/dlgnewp.c b/bld/wv/c/dlgnewp.c
@@ -97,7 +97,7 @@ static void DoDlgNewProg( dlg_new_prog  *pdlg )
     pdlg->prog = prog;
     pdlg->args = args;
     pdlg->cancel = true;
-    ResDlgOpen( ProgGUIEventProc, pdlg, DIALOG_NEW_PROG );
+    DlgOpenRes( ProgGUIEventProc, pdlg, DIALOG_NEW_PROG );
 }
 
 void    DlgNewProg( void )

diff --git a/bld/wv/c/dlgoptn.c b/bld/wv/c/dlgoptn.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2019 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -134,6 +134,6 @@ bool    DlgOptSet( void )
     dlg_window_set      optset;
 
     optset.cancel = true;
-    ResDlgOpen( OptSetGUIEventProc, &optset, DIALOG_OPTION );
+    DlgOpenRes( OptSetGUIEventProc, &optset, DIALOG_OPTION );
     return( !optset.cancel );
 }
diff --git a/bld/wv/c/dlgstk.c b/bld/wv/c/dlgstk.c
@@ -72,7 +72,7 @@ static bool DoStackOrHistory( int dlg_id )
     gui_ctl_id  resp;
 
     resp = CTL_STK_CANCEL;
-    ResDlgOpen( StkOrHistoryGUIEventProc, &resp, dlg_id );
+    DlgOpenRes( StkOrHistoryGUIEventProc, &resp, dlg_id );
     switch( resp ) {
     case CTL_STK_CANCEL:
         _SwitchOn( SW_EXECUTE_ABORTED );

diff --git a/bld/wv/c/dlgvarx.c b/bld/wv/c/dlgvarx.c
@@ -105,7 +105,7 @@ bool    DlgVarExpand( dlg_var_expand *pvarx )
     varx.start = pvarx->start;
     varx.end = pvarx->end;
     varx.cancel = true;
-    ResDlgOpen( VarGUIEventProc, &varx, DIALOG_VARX );
+    DlgOpenRes( VarGUIEventProc, &varx, DIALOG_VARX );
     if( varx.cancel )
         return( false );
     pvarx->start = varx.start;

diff --git a/bld/wv/c/dlgwind.c b/bld/wv/c/dlgwind.c
@@ -143,6 +143,6 @@ bool    DlgWndSet( void )
     dlg_window_set      wndset;
 
     wndset.cancel = true;
-    ResDlgOpen( WndSetGUIEventProc, &wndset, DIALOG_WIND );
+    DlgOpenRes( WndSetGUIEventProc, &wndset, DIALOG_WIND );
     return( !wndset.cancel );
 }