Manager: compile fixes

This commit is contained in:
David Anderson 2014-05-08 01:05:11 -07:00
parent 1e2fcb4b68
commit eebec1c63c
4 changed files with 6 additions and 6 deletions

View File

@ -444,13 +444,13 @@ int RPCThread::ProcessRPCRequest() {
break;
case RPC_GET_CC_CONFIG:
retval = (m_pDoc->rpcClient).get_cc_config(
*(CONFIG*)(current_request->arg1),
*(CC_CONFIG*)(current_request->arg1),
*(LOG_FLAGS*)(current_request->arg2)
);
break;
case RPC_SET_CC_CONFIG:
retval = (m_pDoc->rpcClient).set_cc_config(
*(CONFIG*)(current_request->arg1),
*(CC_CONFIG*)(current_request->arg1),
*(LOG_FLAGS*)(current_request->arg2)
);
break;

View File

@ -339,9 +339,9 @@ public:
{ return RPC_Wait(RPC_GET_GLOBAL_PREFS_OVERRIDE_STRUCT, (void*)&arg1, (void*)&arg2); }
int set_global_prefs_override_struct(GLOBAL_PREFS& arg1, GLOBAL_PREFS_MASK& arg2)
{ return RPC_Wait(RPC_SET_GLOBAL_PREFS_OVERRIDE_STRUCT, (void*)&arg1, (void*)&arg2); }
int get_cc_config(CONFIG& arg1, LOG_FLAGS& arg2)
int get_cc_config(CC_CONFIG& arg1, LOG_FLAGS& arg2)
{ return RPC_Wait(RPC_GET_CC_CONFIG, (void*)&arg1, (void*)&arg2); }
int set_cc_config(CONFIG& arg1, LOG_FLAGS& arg2)
int set_cc_config(CC_CONFIG& arg1, LOG_FLAGS& arg2)
{ return RPC_Wait(RPC_SET_CC_CONFIG, (void*)&arg1, (void*)&arg2); }
private:
CMainDocument* m_pDoc;

View File

@ -69,7 +69,7 @@ private:
GLOBAL_PREFS prefs;
GLOBAL_PREFS_MASK mask;
LOG_FLAGS log_flags;
CONFIG config;
CC_CONFIG config;
bool m_bExclusiveAppsDataChanged;
bool m_bPrefsDataChanged;
bool m_bInInit;

View File

@ -57,7 +57,7 @@ private:
void CreateCheckboxes();
LOG_FLAGS log_flags;
CONFIG config;
CC_CONFIG config;
wxGridSizer* m_headingSizer;
std::vector <wxCheckBox*> m_checkbox_list;