diff options
| author |  Fabio Bas | 2010-09-04 09:25:49 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-09-04 09:25:49 +0000 |
| commit | 8f749b8de91a87d0ca94e24326fb211e9fb0f9d2 (patch) | |
| tree | b6e368ea535767744a521df2cee596a1fba38df0 /src/modules | |
| parent | update (diff) | |
| download | KVIrc-8f749b8de91a87d0ca94e24326fb211e9fb0f9d2.tar.gz KVIrc-8f749b8de91a87d0ca94e24326fb211e9fb0f9d2.tar.bz2 KVIrc-8f749b8de91a87d0ca94e24326fb211e9fb0f9d2.zip | |
fix for #943
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4976 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dialog/libkvidialog.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index ffb1cc629..8c59cdbbf 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -260,7 +260,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( KviTalHBox * box = new KviTalHBox(this); g->addWidget(box,2,1,1,2); - m_iEscapeButton = 0; + m_iEscapeButton = -1; m_iDefaultButton = 0; if(!szButton0.isEmpty()) @@ -320,6 +320,16 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( connect(pb3,SIGNAL(clicked()),this,SLOT(b2Clicked())); } + if(m_iEscapeButton < 0) + { + //no escape button explicitly set, search for one: + if(!szButton2.isEmpty()) + m_iEscapeButton = 2; + else if(!szButton1.isEmpty()) + m_iEscapeButton = 1; + else + m_iEscapeButton = 0; + } } KviKvsCallbackTextInput::~KviKvsCallbackTextInput() |