Changeset 42


Ignore:
Timestamp:
10/12/2007 9:08:29 AM (6 years ago)
Author:
lowjoel
Message:

Bump the version number.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/KeyComboDlg.cpp

    r38 r42  
    2626#include "KeyComboDlg.h" 
    2727#include <shared/key.h> 
    28  
     28#include <commctrl.h> 
    2929 
    3030const LPCTSTR szAccelerKey = "Acceler"; 
    … …  
    9292    // function and call CRichEditCtrl().SetEventMask() 
    9393    // with the ENM_CHANGE flag ORed into the mask. 
    94  
    95     // TODO:  Add your control notification handler code here 
    96     //char cLine[10]; 
    9794    char ch[10]; 
    9895    m_eKey.GetLine(0,ch,1); 
    9996    CString strLine(ch); 
    100     if (!strLine.IsEmpty()) 
     97    static bool busy = false; 
     98    if (busy) 
     99        return; 
     100    busy = true; 
     101 
     102    if (!strLine.Trim().IsEmpty()) 
    101103    { 
    102104        CString strTmp(m_strRegKey.MakeUpper()); 
    103105        strLine.MakeUpper(); 
    104         if (strTmp.Find(strLine[0]) ==-1 ) { 
    105             m_eKey.Undo(); 
    106             m_eKey.SetWindowText(""); 
     106        if (strTmp.Find(strLine[0]) == -1) { 
     107            //Invalid selection, clear the entry 
     108            m_eKey.SetWindowText("m"); 
     109 
     110            //TODO: This works only with XP/Vista. What about others? 
     111            EDITBALLOONTIP ebtt; 
     112            ZeroMemory(&ebtt, sizeof(ebtt)); 
     113            ebtt.cbStruct = sizeof(ebtt); 
     114            ebtt.pszTitle = L"Invalid shortcut"; 
     115            ebtt.ttiIcon = TTI_ERROR; 
     116 
     117            strTmp = "The shortcut value must be one of the characters " + strTmp; 
     118            ebtt.pszText = new wchar_t[strTmp.GetLength() + 1]; 
     119            mbstowcs((wchar_t*)ebtt.pszText, strTmp.GetBuffer(), strTmp.GetLength() + 1); 
     120             
     121            m_eKey.SendMessage(EM_SHOWBALLOONTIP, 0, (LPARAM)&ebtt); 
     122            delete[] ebtt.pszText; 
    107123        } 
    108124    } 
    109  
     125    busy = false; 
    110126} 

  • trunk/version.h

    r39 r42  
    33#define MINOR_NUMBER 8 
    44#define BUILD_NUMBER 5 
    5 #define BUILD_NUMBER_STRING "beta1-1" 
    6 #define VERSION_NUMBER_STRING "5.85-beta1" 
     5#define BUILD_NUMBER_STRING "beta2-1" 
     6#define VERSION_NUMBER_STRING "5.85-beta2" 
    77#define COMPANY_NAME "Heidi Computers Ltd" 
Note: See TracChangeset for help on using the changeset viewer.