mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-18 22:26:30 +01:00
add no-bt state so there can be no icon when bt's been left off; up
version and turn BT on by default for a8 release.
This commit is contained in:
parent
9a86b69527
commit
a0ec3417c2
4 changed files with 6 additions and 3 deletions
|
@ -118,7 +118,7 @@ MYDEFS_COMMON += -DXWFEATURE_SEARCHLIMIT
|
||||||
# MYDEFS_COMMON += -DXWFEATURE_RELAY
|
# MYDEFS_COMMON += -DXWFEATURE_RELAY
|
||||||
|
|
||||||
# turn on bluetooth comms option for 68K and ARM -- which won't work yet
|
# turn on bluetooth comms option for 68K and ARM -- which won't work yet
|
||||||
# BLUETOOTH = -DXWFEATURE_BLUETOOTH
|
BLUETOOTH = -DXWFEATURE_BLUETOOTH
|
||||||
MYDEFS_COMMON += $(BLUETOOTH)
|
MYDEFS_COMMON += $(BLUETOOTH)
|
||||||
|
|
||||||
# Add menu allowing to choose to run 68K or ARM
|
# Add menu allowing to choose to run 68K or ARM
|
||||||
|
|
|
@ -1574,6 +1574,8 @@ showConnState( PalmAppGlobals* globals )
|
||||||
if ( !!comms ) {
|
if ( !!comms ) {
|
||||||
if ( (COMMS_CONN_BT == comms_getConType( comms )) ) {
|
if ( (COMMS_CONN_BT == comms_getConType( comms )) ) {
|
||||||
switch( globals->btUIState ) {
|
switch( globals->btUIState ) {
|
||||||
|
case BTUI_NOBT:
|
||||||
|
break;
|
||||||
case BTUI_NONE:
|
case BTUI_NONE:
|
||||||
resID = BTSTATUS_NONE_RES_ID; break;
|
resID = BTSTATUS_NONE_RES_ID; break;
|
||||||
case BTUI_LISTENING:
|
case BTUI_LISTENING:
|
||||||
|
|
|
@ -222,7 +222,8 @@ typedef struct NetLibStuff {
|
||||||
|
|
||||||
#ifdef XWFEATURE_BLUETOOTH
|
#ifdef XWFEATURE_BLUETOOTH
|
||||||
typedef enum {
|
typedef enum {
|
||||||
BTUI_NONE
|
BTUI_NOBT
|
||||||
|
, BTUI_NONE
|
||||||
, BTUI_LISTENING
|
, BTUI_LISTENING
|
||||||
, BTUI_CONNECTING
|
, BTUI_CONNECTING
|
||||||
, BTUI_CONNECTED /* slave */
|
, BTUI_CONNECTED /* slave */
|
||||||
|
|
|
@ -434,7 +434,7 @@
|
||||||
|
|
||||||
/* versioning stuff */
|
/* versioning stuff */
|
||||||
#ifdef XWFEATURE_BLUETOOTH
|
#ifdef XWFEATURE_BLUETOOTH
|
||||||
# define XW_PALM_VERSION_STRING "4.3a7"
|
# define XW_PALM_VERSION_STRING "4.3a8"
|
||||||
#else
|
#else
|
||||||
# define XW_PALM_VERSION_STRING "4.2rc1"
|
# define XW_PALM_VERSION_STRING "4.2rc1"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue