|
Lines 36-43
Link Here
|
| 36 |
|
36 |
|
| 37 |
XAP_Dialog::XAP_Dialog(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id, |
37 |
XAP_Dialog::XAP_Dialog(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id, |
| 38 |
const char * helpUrl ) |
38 |
const char * helpUrl ) |
| 39 |
: m_pApp ( NULL ), m_pDlgFactory ( pDlgFactory ), m_id ( id ), |
39 |
: m_pApp ( nullptr ), m_pDlgFactory ( pDlgFactory ), m_id ( id ), |
| 40 |
m_helpUrl(NULL) |
40 |
m_helpUrl(nullptr) |
| 41 |
{ |
41 |
{ |
| 42 |
m_pApp = pDlgFactory->getApp(); |
42 |
m_pApp = pDlgFactory->getApp(); |
| 43 |
|
43 |
|
|
Lines 235-241
Link Here
|
| 235 |
// This function returns the frame currently connected to a modeless dialog |
235 |
// This function returns the frame currently connected to a modeless dialog |
| 236 |
|
236 |
|
| 237 |
XAP_Frame * pFrame = m_pApp->getLastFocussedFrame(); |
237 |
XAP_Frame * pFrame = m_pApp->getLastFocussedFrame(); |
| 238 |
if(pFrame == (XAP_Frame *) NULL) |
238 |
if(pFrame == (XAP_Frame *) nullptr) |
| 239 |
{ |
239 |
{ |
| 240 |
pFrame = m_pApp->getFrame(0); |
240 |
pFrame = m_pApp->getFrame(0); |
| 241 |
} |
241 |
} |
|
Lines 267-273
Link Here
|
| 267 |
// This function constructs and returns the window name of a modeless dialog by |
267 |
// This function constructs and returns the window name of a modeless dialog by |
| 268 |
// concatenating the active frame with the dialog name |
268 |
// concatenating the active frame with the dialog name |
| 269 |
|
269 |
|
| 270 |
*pWindowName = (char) NULL; |
270 |
*pWindowName = '\0'; |
| 271 |
UT_UTF8String wn = UT_UTF8String(pDialogName); |
271 |
UT_UTF8String wn = UT_UTF8String(pDialogName); |
| 272 |
|
272 |
|
| 273 |
XAP_Frame* pFrame = getActiveFrame(); |
273 |
XAP_Frame* pFrame = getActiveFrame(); |
