Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make startbar draft compile and run under 6-SDK #293

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −21
Open

Make startbar draft compile and run under 6-SDK #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63b4346
Make startbar draft compile and run under 6-SDK
HubertHuckevoll Nov 25, 2023
431ecc6
Merge branch 'bluewaysw:master' into Start-Bar-utility
HubertHuckevoll Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Appl/Breadbox/SBarP/Art/nd-ico.goh → Appl/Breadbox/SBarP/Art/ndico.goh
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions Appl/Breadbox/SBarP/SBarApp.goh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
** Copyright 1991-94 Geoworks -- All Rights Reserved
** Project: QBar
** Module: QBARAPP.GOH
** Filename:
** Filename:
** Author: Clemens Kochinke
*************************************/
@include <stdapp.goh> /* Standard application headers. */
@include <ansi/string.h> /* Ansi C string function header */
@include <gstring.h>
@include <Ansi/string.h> /* Ansi C string function header */
@include <gstring.h>
@include <iacp.goh>
@include <Objects/eMenuC.goh>

Expand All @@ -34,8 +34,8 @@ typedef ByteEnum DBOpenState;
#define STARTBAR_OPEN_PREF_NEWDESK 7

/***************************************
* Class
***************************************/
* Class
***************************************/
@class StartBarProcessClass, GenProcessClass;
@message void MSG_STARTBAR_OPEN_PREF(byte whichApp);
@message void MSG_STARTBAR_EMENU();
Expand Down
8 changes: 4 additions & 4 deletions Appl/Breadbox/SBarP/SBarMsg.goc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ File: sbarmsg.goc
Date: 12/31/1997
Author: Clemens Kochinke
****************************************************************/
@include <sbarapp.goh>
@include <Objects/sbarutil.goh>
@include <SBarApp.goh>
@include <Objects/SBarUtil.goh>

extern Boolean G_autohideOn;
extern Boolean G_barIsShowing ;
Expand Down Expand Up @@ -89,13 +89,13 @@ void StopAutoHideTimer(void)
}
}

@start TextRes, data;
@start TEXTRES, data;
/*---------------------------------------------------------------------*/
@chunk char LaunchErr[] =
"The program is not in World or System\\Sysappl "
"and cannot be started.";
/*---------------------------------------------------------------------*/
@end TextRes;
@end TEXTRES;

@if 1
@extern method StartBarProcessClass, MSG_STARTBAR_OPEN_PREF
Expand Down
16 changes: 8 additions & 8 deletions Appl/Breadbox/SBarP/SBarUI.goc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
*******************************************************************/

@include <stdapp.goh>
@include <system.h>
@include <system.h>
@include <initfile.h>
@include "Sbarapp.goh"
@include "Art/ndstart.goh"
@include "Art/nd-ico.goh"
@include <objects/text/tcommon.h>
@include "SBarApp.goh"
@include "Art/NDStart.goh"
@include "Art/ndico.goh"
@include <Objects/Text/tCommon.h>
@include <timedate.h>
@include <Ansi/stdio.h>
@include <launchp.h>
@include <resource.h>
@include <library.h>
@include <Objects/sbarutil.goh>
@include <Objects/SBarUtil.goh>

/* @define ALLOW_PROPERTY_STARTBAR_AUTO_LOAD */
@define COMPILE_OPTION_START_BUTTON_OPENS_EXPRESS_MENU
Expand Down Expand Up @@ -275,7 +275,7 @@ optr G_moduleParents[MAX_STARTBAR_MODULES] ;
/* The following objects are the pop up menus that appear usually from */
/* right clicking on an item */

@start StartBarMenuRes;
@start STARTBARMENURES;
/*---------------------------------------------------------------------*/
@object GenInteractionClass EMenu = {
GI_comp = @EM1;
Expand Down Expand Up @@ -724,7 +724,7 @@ optr G_moduleParents[MAX_STARTBAR_MODULES] ;
ATTR_GEN_TRIGGER_INTERACTION_COMMAND = { IC_DISMISS };
}
/*---------------------------------------------------------------------*/
@end StartBarMenuRes;
@end STARTBARMENURES;


/*=========================================================================*/
Expand Down
0 Appl/Breadbox/SBarP/SBarP.gp → Appl/Breadbox/SBarP/sbarp.gp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Library/Breadbox/SBarUtil/SBarUtil.goc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
**************************************************************************/

@include <stdapp.goh>
@include <Objects/sbarutil.goh>
@include <Objects/SBarUtil.goh>
@include <Ansi/string.h>
@include <initfile.h>

Expand Down
2 changes: 1 addition & 1 deletion Library/Breadbox/SBarUtil/local.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
XGOCFLAGS = -L sbarutil

# Force Borland C to create code that loads DS in function entry
XCCOMFLAGS = -WDE
# XCCOMFLAGS = -WDE

4 changes: 2 additions & 2 deletions Library/Breadbox/SBarUtil/SBarUtil.gp → Library/Breadbox/SBarUtil/sbarutil.gp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
##############################################################################

name sbarutil.lib
name SBarUtil.lib
longname "Startbar Utilities Module"
tokenchars "SBrU"
tokenid 16431
Expand All @@ -26,4 +26,4 @@ export StartbarHighlightBoxClass
export StartbarUtilLoadApplication


usernotes "Copyright 1994-2002 Breadbox Computer Company LLC All Rights Reserved"
# usernotes "Copyright 1994-2002 Breadbox Computer Company LLC All Rights Reserved"